chore: publish 1.6.0+1.26.0 release

fixed syntax on cp command

.env.sample

@@ -14,3 +14,12 @@ COMPOSE_FILE="compose.yml"
 #COMPOSE_FILE="$COMPOSE_FILE:compose.git-pull.yml"
 #GIT_REPO_URL="https://git.coopcloud.tech/dalmationer/hexbomb.gay"
 #CRON_SCHEDULE="*/1 * * * *"
+
+# Optionally redirect the entire domain or a sub-path:
+# path under which you want to redirect all URLs (with trailing slash):
+#REDIRECT_FROM_PATH=/
+# full URL of target domain (and optionally path) with trailing slash:
+#REDIRECT_TO_URL=https://coopcloud.tech/
+# temporary or permanent redirect? (uncomment one)
+#REDIRECT_TYPE=redirect
+#REDIRECT_TYPE=permanent

README.md

@@ -25,7 +25,7 @@ Custom HTML website, served using Nginx.
 5. `abra app deploy YOURAPPDOMAIN`
 6. Copy your files to the container, using something like
 ```
-abra app YOURAPPDOMAIN cp index.html app:/usr/share/nginx/html
+abra app cp YOURAPPDOMAIN index.html app:/usr/share/nginx/html
 ```
 
 [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra

abra.sh

@@ -1,2 +1,2 @@
-export NGINX_DEFAULT_CONF_VERSION=v1
+export NGINX_DEFAULT_CONF_VERSION=v5
 export ENTRYPOINT_CONF_VERSION=v3

compose.git-pull.yml

@@ -3,7 +3,7 @@ services:
   git:
     environment:
       - GIT_REPO_URL
-    image: alpine/git:v2.36.3
+    image: alpine/git:v2.43.0
     entrypoint: /docker-entrypoint.sh
     volumes:
       - content:/git

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: nginx:1.23.3
+    image: nginx:1.26.0
     networks:
       - proxy
     deploy:
@@ -19,11 +19,14 @@ 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.3.2+1.23.3"
+        - "coop-cloud.${STACK_NAME}.version=1.6.0+1.26.0"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/usr/share/nginx/html"
     environment:
-      DEFAULT_CONF_FILE: /etc/nginx/conf.d/default.conf
+      - DEFAULT_CONF_FILE=/etc/nginx/conf.d/default.conf
+      - REDIRECT_FROM_PATH
+      - REDIRECT_TO_URL
+      - REDIRECT_TYPE
     volumes:
       - content:/usr/share/nginx/html
     configs:
@@ -42,7 +45,8 @@ volumes:
 configs:
   nginx_default_conf:
     name: ${STACK_NAME}_nginx_default_conf_${NGINX_DEFAULT_CONF_VERSION}
-    file: default.conf
+    file: default.conf.tmpl
+    template_driver: golang
 
 networks:
   proxy:

default.conf.tmpl

@@ -10,10 +10,18 @@ server {
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
-				try_files $uri $uri/ $uri.html;
+       
+        {{ if env "REDIRECT_TO_URL" }}
+            rewrite ^{{ env "REDIRECT_FROM_PATH" }}(.*)$ {{ env "REDIRECT_TO_URL" }}$1 {{ env "REDIRECT_TYPE" }}; 
+        {{ end }}
+
+		try_files $uri $uri/ $uri.html =404;
     }
 
-    #error_page  404              /404.html;
+    error_page  404              /404.html;
+    location = /404.html {
+        root   /usr/share/nginx/html;
+    }
 
     # redirect server error pages to the static page /50x.html
     #