.drone.yml

@@ -33,7 +33,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - toolshed/auto-recipes-catalogue-json
+        - coop-cloud/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -23,10 +23,3 @@ COMPOSE_FILE="compose.yml"
 # temporary or permanent redirect? (uncomment one)
 #REDIRECT_TYPE=redirect
 #REDIRECT_TYPE=permanent
-
-# Optionally handle all URL requests using a single file (commonly index.html)
-#SINGLE_PAGE_SITE_HANDLER=/index.html
-
-# Enable an SSH server to allow SFTP uploads to the web root
-#COMPOSE_FILE="$COMPOSE_FILE:compose.sftp.yml"
-#PUBLIC_KEY="ssh-ed25519 AAAAC3NzaJ1lZDI1NTE5AAAAIXqf4nxUxuGmLOaxXXXXXXXXoM/GwhcrAgmtbgXToaYmCJ user@host" # Replace with a public key you generate

README.md

@@ -5,7 +5,7 @@
 Custom HTML website, served using Nginx.
 
 <!-- metadata -->
-* **Category**: Development
+* **Category**: Apps
 * **Status**: 2, beta
 * **Image**: [`nginx`](https://hub.docker.com/_/nginx), 4, upstream
 * **Healthcheck**: No
@@ -25,23 +25,8 @@ Custom HTML website, served using Nginx.
 5. `abra app deploy YOURAPPDOMAIN`
 6. Copy your files to the container, using something like
 ```
-abra app cp YOURAPPDOMAIN index.html app:/usr/share/nginx/html
+abra app YOURAPPDOMAIN cp index.html app:/usr/share/nginx/html
 ```
 
-## Allowing upload via SSH/SFTP
-To allow management of your site's files using scp, rsync or other SSH-based tools:
-1. If you don't already have one, generate an SSH keypair using `ssh-keygen`
-1. `abra app config YOURAPPDOMAIN`
-2. Uncomment these lines and add your public key:
-```
-#COMPOSE_FILE="$COMPOSE_FILE:compose.sftp.yml"
-#PUBLIC_KEY="ssh-ed25519 AAAAC3NzaJ1lZDI1NTE5AAAAIXqf4nxUxuGmLOaxXXXXXXXXoM/GwhcrAgmtbgXToaYmCJ user@host" # Replace with a public key you generate
-```
-3. `abra app undeploy YOURAPPDOMAIN`
-3. `abra app deploy YOURAPPDOMAIN`
-4. Test the SSH connection: `ssh -p 2220 sftp@YOURAPPDOMAIN`
-5. You can copy local files into the server's web root with a command like: `scp -r -P 2220 * sftp@YOURAPPDOMAIN:/content`
-
-
 [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
 [`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik

abra.sh

@@ -1,2 +1,2 @@
-export NGINX_DEFAULT_CONF_VERSION=v6
+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.47.2
+    image: alpine/git:v2.36.3
     entrypoint: /docker-entrypoint.sh
     volumes:
       - content:/git

compose.sftp.yml

@@ -1,41 +0,0 @@
-version: "3.8"
-services:
-  ssh:
-    image: lscr.io/linuxserver/openssh-server:latest
-    networks:
-      - proxy
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Etc/UTC
-      - USER_NAME=sftp
-      - PUBLIC_KEY
-    volumes:
-      - content:/content:rw
-    ports:
-      - 2220:2222
-    deploy:
-      restart_policy:
-        condition: on-failure
-  # The following is an admittedly hacky way of setting the owner
-  # of the `content` volume to the unprivileged `sftp` user, so
-  # that content can be transferred through the unprivileged sshd process
-  # using `scp` etc.
-  sshstart:
-    image: lscr.io/linuxserver/openssh-server:latest
-    user: root
-    depends_on:
-      - ssh
-    deploy:
-      restart_policy:
-        condition: none
-    volumes:
-      - content:/content:rw
-    entrypoint: [ "bash", "-c", "sleep 10 && chown -R 1000:1000 /content"]
-
-volumes:
-  content:
-
-networks:
-  proxy:
-    external: true

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: nginx:1.28.0
+    image: nginx:1.23.3
     networks:
       - proxy
     deploy:
@@ -19,7 +19,7 @@ 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.10.0+1.28.0"
+        - "coop-cloud.${STACK_NAME}.version=1.3.1+1.23.3"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/usr/share/nginx/html"
     environment:

default.conf.tmpl

@@ -15,11 +15,7 @@ server {
             rewrite ^{{ env "REDIRECT_FROM_PATH" }}(.*)$ {{ env "REDIRECT_TO_URL" }}$1 {{ env "REDIRECT_TYPE" }}; 
         {{ end }}
 
-        {{ if env "SINGLE_PAGE_SITE_HANDLER" }}
-		try_files $uri $uri/ {{ env "SINGLE_PAGE_SITE_HANDLER" }} =404;
-        {{ else }}
-        try_files $uri $uri/ $uri.html =404;
-        {{ end }}
+		try_files $uri $uri/ $uri.html =404;
     }
 
     error_page  404              /404.html;

release/1.10.0+1.28.0

@@ -1 +0,0 @@
-Adds optional sftp support