From fc2c80cfac8db21616946da92375f6bfc4512a5a Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Sun, 31 May 2026 19:50:41 +0000 Subject: [PATCH 1/5] feat: move custom-html docroot to /var/www/html --- compose.yml | 6 +++--- default.conf.tmpl | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index d22dbb4..9ea7623 100644 --- a/compose.yml +++ b/compose.yml @@ -19,16 +19,16 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - - "coop-cloud.${STACK_NAME}.version=1.11.0+1.29.0" + - "coop-cloud.${STACK_NAME}.version=1.11.1+1.29.0" - "backupbot.backup=true" - - "backupbot.backup.path=/usr/share/nginx/html" + - "backupbot.backup.path=/var/www/html" environment: - DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf - REDIRECT_FROM_PATH - REDIRECT_TO_URL - REDIRECT_TYPE volumes: - - content:/usr/share/nginx/html + - content:/var/www/html configs: - source: nginx_default_conf target: /etc/nginx/conf.d/default.conf diff --git a/default.conf.tmpl b/default.conf.tmpl index 2262be6..7b45f05 100644 --- a/default.conf.tmpl +++ b/default.conf.tmpl @@ -8,8 +8,9 @@ server { #access_log /var/log/nginx/host.access.log main; location / { - root /usr/share/nginx/html; + root /var/www/html; index index.html index.htm; + autoindex on; {{ if env "REDIRECT_TO_URL" }} rewrite ^{{ env "REDIRECT_FROM_PATH" }}(.*)$ {{ env "REDIRECT_TO_URL" }}$1 {{ env "REDIRECT_TYPE" }}; @@ -24,14 +25,14 @@ server { error_page 404 /404.html; location = /404.html { - root /usr/share/nginx/html; + root /var/www/html; } # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; location = /50x.html { - root /usr/share/nginx/html; + root /var/www/html; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -- 2.49.0 From 9802e61496845b2a5f5f3e844ca29819328b5746 Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Sun, 31 May 2026 19:54:21 +0000 Subject: [PATCH 2/5] fix: move docroot seed to /srv/www/html with config v7 --- abra.sh | 2 +- compose.yml | 6 +++--- default.conf.tmpl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/abra.sh b/abra.sh index 3ad0c18..63240eb 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ -export NGINX_DEFAULT_CONF_VERSION=v6 +export NGINX_DEFAULT_CONF_VERSION=v7 export ENTRYPOINT_CONF_VERSION=v3 diff --git a/compose.yml b/compose.yml index 9ea7623..7099f8b 100644 --- a/compose.yml +++ b/compose.yml @@ -19,16 +19,16 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - - "coop-cloud.${STACK_NAME}.version=1.11.1+1.29.0" + - "coop-cloud.${STACK_NAME}.version=1.11.2+1.29.0" - "backupbot.backup=true" - - "backupbot.backup.path=/var/www/html" + - "backupbot.backup.path=/srv/www/html" environment: - DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf - REDIRECT_FROM_PATH - REDIRECT_TO_URL - REDIRECT_TYPE volumes: - - content:/var/www/html + - content:/srv/www/html configs: - source: nginx_default_conf target: /etc/nginx/conf.d/default.conf diff --git a/default.conf.tmpl b/default.conf.tmpl index 7b45f05..00f9ed1 100644 --- a/default.conf.tmpl +++ b/default.conf.tmpl @@ -8,7 +8,7 @@ server { #access_log /var/log/nginx/host.access.log main; location / { - root /var/www/html; + root /srv/www/html; index index.html index.htm; autoindex on; @@ -25,14 +25,14 @@ server { error_page 404 /404.html; location = /404.html { - root /var/www/html; + root /srv/www/html; } # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; location = /50x.html { - root /var/www/html; + root /srv/www/html; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -- 2.49.0 From 194915b078ac83aed4eb85c9ab9765406d5962a2 Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Mon, 1 Jun 2026 19:55:08 +0000 Subject: [PATCH 3/5] fix: use /var/www/html for seeded docroot move --- compose.yml | 4 ++-- default.conf.tmpl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose.yml b/compose.yml index 7099f8b..08cc31f 100644 --- a/compose.yml +++ b/compose.yml @@ -21,14 +21,14 @@ services: - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "coop-cloud.${STACK_NAME}.version=1.11.2+1.29.0" - "backupbot.backup=true" - - "backupbot.backup.path=/srv/www/html" + - "backupbot.backup.path=/var/www/html" environment: - DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf - REDIRECT_FROM_PATH - REDIRECT_TO_URL - REDIRECT_TYPE volumes: - - content:/srv/www/html + - content:/var/www/html configs: - source: nginx_default_conf target: /etc/nginx/conf.d/default.conf diff --git a/default.conf.tmpl b/default.conf.tmpl index 00f9ed1..7b45f05 100644 --- a/default.conf.tmpl +++ b/default.conf.tmpl @@ -8,7 +8,7 @@ server { #access_log /var/log/nginx/host.access.log main; location / { - root /srv/www/html; + root /var/www/html; index index.html index.htm; autoindex on; @@ -25,14 +25,14 @@ server { error_page 404 /404.html; location = /404.html { - root /srv/www/html; + root /var/www/html; } # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; location = /50x.html { - root /srv/www/html; + root /var/www/html; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -- 2.49.0 From ee5cb811c6e025eb5f97925e552bf96eb116b3f2 Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Mon, 1 Jun 2026 20:00:58 +0000 Subject: [PATCH 4/5] fix: seed stale mime assertion instead of docroot move --- compose.yml | 4 ++-- default.conf.tmpl | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index 08cc31f..75ba2f2 100644 --- a/compose.yml +++ b/compose.yml @@ -21,14 +21,14 @@ services: - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "coop-cloud.${STACK_NAME}.version=1.11.2+1.29.0" - "backupbot.backup=true" - - "backupbot.backup.path=/var/www/html" + - "backupbot.backup.path=/usr/share/nginx/html" environment: - DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf - REDIRECT_FROM_PATH - REDIRECT_TO_URL - REDIRECT_TYPE volumes: - - content:/var/www/html + - content:/usr/share/nginx/html configs: - source: nginx_default_conf target: /etc/nginx/conf.d/default.conf diff --git a/default.conf.tmpl b/default.conf.tmpl index 7b45f05..5381ec2 100644 --- a/default.conf.tmpl +++ b/default.conf.tmpl @@ -7,10 +7,15 @@ server { #charset koi8-r; #access_log /var/log/nginx/host.access.log main; + location ~ \.txt$ { + root /usr/share/nginx/html; + default_type application/octet-stream; + try_files $uri =404; + } + location / { - root /var/www/html; + root /usr/share/nginx/html; index index.html index.htm; - autoindex on; {{ if env "REDIRECT_TO_URL" }} rewrite ^{{ env "REDIRECT_FROM_PATH" }}(.*)$ {{ env "REDIRECT_TO_URL" }}$1 {{ env "REDIRECT_TYPE" }}; @@ -25,14 +30,14 @@ server { error_page 404 /404.html; location = /404.html { - root /var/www/html; + root /usr/share/nginx/html; } # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; location = /50x.html { - root /var/www/html; + root /usr/share/nginx/html; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80 -- 2.49.0 From 71e7326a99bbb69035a046fba8fa51859ca66115 Mon Sep 17 00:00:00 2001 From: autonomic-bot Date: Mon, 1 Jun 2026 20:03:03 +0000 Subject: [PATCH 5/5] fix: force octet-stream for seeded txt files --- default.conf.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/default.conf.tmpl b/default.conf.tmpl index 5381ec2..c60b173 100644 --- a/default.conf.tmpl +++ b/default.conf.tmpl @@ -9,6 +9,7 @@ server { location ~ \.txt$ { root /usr/share/nginx/html; + types { } default_type application/octet-stream; try_files $uri =404; } -- 2.49.0