From 5f07f08bff3b0291256d2ba4008e00b3857ae2b1 Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Sun, 26 Oct 2025 13:12:41 -0700
Subject: [PATCH] updated zammad

---
 network.yml                       |  7 ++++---
 stashapp/docker-compose.yml       |  2 ++
 zammad/README.md                  |  6 +++++-
 zammad/docker-compose.yml         |  6 +++---
 zammad/{env-sample => sample.env} | 12 +++++++-----
 5 files changed, 21 insertions(+), 12 deletions(-)
 rename zammad/{env-sample => sample.env} (96%)

diff --git a/network.yml b/network.yml
index edaf755..ff2ca6c 100644
--- a/network.yml
+++ b/network.yml
@@ -1,6 +1,7 @@
+# Sample Networks setting
+
 networks:
   proxy:
     external: true  # Shared for reverse proxies (create once: docker network create proxy)
-  internal:
-    driver: bridge
-    name: ${COMPOSE_PROJECT_NAME:-cookbook}_internal  # Project-isolated (from cookbook.env)
\ No newline at end of file
+  app-internal: # Change this to the project name
+    driver: bridge
\ No newline at end of file
diff --git a/stashapp/docker-compose.yml b/stashapp/docker-compose.yml
index 0ad0387..97638cf 100644
--- a/stashapp/docker-compose.yml
+++ b/stashapp/docker-compose.yml
@@ -19,3 +19,5 @@ services:
     ports: # Optional, can remove if running proxy
       - "${STASHAPP_PORT:-9999}:9999"
     network_mode: "host" # Optional, to run DLNA
+    networks: # optional for reverse proxy
+      - proxy
diff --git a/zammad/README.md b/zammad/README.md
index f699398..f3ea978 100644
--- a/zammad/README.md
+++ b/zammad/README.md
@@ -9,4 +9,8 @@ Official Documenation: https://docs.zammad.org/en/latest/install/docker-compose.
 
 Official Repository: https://github.com/zammad/zammad-docker-compose/blob/master/docker-compose.yml
 
-chmod data directory to 1000:1000
+```bash
+mkdir -p data/elasticsearch
+chown -R 1000:1000 data/
+chmod -R 755 data/elasticsearch/
+```
diff --git a/zammad/docker-compose.yml b/zammad/docker-compose.yml
index 2166783..20028fb 100644
--- a/zammad/docker-compose.yml
+++ b/zammad/docker-compose.yml
@@ -14,7 +14,7 @@ x-shared:
       POSTGRESQL_DB_CREATE: ${POSTGRESQL_DB_CREATE:-true}
       REDIS_URL: ${REDIS_URL:-redis://zammad-redis:6379}
       # Storage (S3 optional; leave empty for local)
-      S3_URL: ${S3_URL:-}
+      S3_URL: ${S3_URL:-dummy}
       # Backup settings
       BACKUP_DIR: "${BACKUP_DIR:-/var/tmp/zammad}"
       BACKUP_TIME: "${BACKUP_TIME:-03:00}"
@@ -102,8 +102,8 @@ services:
     command: ["zammad-nginx"]
     expose:
       - "${NGINX_PORT:-8080}"
-    #ports:
-    #  - "${NGINX_EXPOSE_PORT:-8080}:${NGINX_PORT:-8080}"
+    ports:
+      - "${NGINX_PORT:-8080}:${NGINX_PORT:-8080}"
     depends_on:
       - zammad-railsserver
 
diff --git a/zammad/env-sample b/zammad/sample.env
similarity index 96%
rename from zammad/env-sample
rename to zammad/sample.env
index e931b4c..9676d48 100644
--- a/zammad/env-sample
+++ b/zammad/sample.env
@@ -11,7 +11,6 @@
 
 # Base path for all persistent data (defaults to ./data relative to docker-compose.yml)
 VOL_PATH=./data
-TZ="America/Vancouver"
 COMPOSE_PROJECT_NAME=zammad
 
 # Use a fixed Zammad version rather than the default. If you do so,
@@ -54,17 +53,18 @@ COMPOSE_PROJECT_NAME=zammad
 # ZAMMAD_HTTP_TYPE=  # e.g., 'https'
 # ZAMMAD_FQDN=  # e.g., yourdomain.com
 
-# NGINX_PORT=8080
+NGINX_PORT=8080
 # NGINX_EXPOSE_PORT=8080
 # NGINX_CLIENT_MAX_BODY_SIZE=50M
 # NGINX_SERVER_NAME=_  # '_' matches all; set to your FQDN/IP for restriction
-# NGINX_SERVER_SCHEME=$scheme  # Or force 'http'/'https'
+scheme=http
+NGINX_SERVER_SCHEME=$scheme  # Or force 'http'/'https'
 
 # Backup settings
 # BACKUP_DIR=/var/tmp/zammad
 # BACKUP_TIME=03:00
 # HOLD_DAYS=10
-# TZ=Europe/Berlin
+TZ=America/Vancouver
 
 # App tuning (scale workers as needed)
 # ZAMMAD_WEB_CONCURRENCY=  # e.g., 4 for more concurrent web connections
@@ -139,4 +139,6 @@ COMPOSE_PROJECT_NAME=zammad
 # ZAMMAD_SCHEDULER_RESOURCES_LIMITS_CPUS=1.0
 # ZAMMAD_SCHEDULER_RESOURCES_LIMITS_MEMORY=500M
 # ZAMMAD_WEBSOCKET_RESOURCES_LIMITS_CPUS=1.0
-# ZAMMAD_WEBSOCKET_RESOURCES_LIMITS_MEMORY=500M
\ No newline at end of file
+# ZAMMAD_WEBSOCKET_RESOURCES_LIMITS_MEMORY=500M
+
+AWS_REGION=dummy
\ No newline at end of file