set proper default domain

the placeholder was not replaced by abra 0.13, now following the convention of other recipes

.drone.yml

@@ -0,0 +1,38 @@
+---
+kind: pipeline
+name: deploy to swarm-test.autonomic.zone
+steps:
+  - name: deployment
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
+    settings:
+      host: swarm-test.autonomic.zone
+      stack: custom-html-tiny
+      generate_secrets: true
+      purge: true
+      deploy_key:
+        from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
+    environment:
+      DOMAIN: custom-html-tiny.swarm-test.autonomic.zone
+      STACK_NAME: custom-html-tiny
+      LETS_ENCRYPT_ENV: production
+trigger:
+  branch:
+    - main
+---
+kind: pipeline
+name: generate recipe catalogue
+steps:
+  - name: release a new version
+    image: plugins/downstream
+    settings:
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - toolshed/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -1,6 +1,6 @@
 TYPE=custom-html-tiny
 
-DOMAIN={{ .Domain }}
+DOMAIN=custom-html-tiny.example.com
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.custom-html.example.com`'
@@ -16,3 +16,6 @@ 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 * * * *"
+
+# Allow access trough plain http
+#COMPOSE_FILE="$COMPOSE_FILE:compose.http.yml"

README.md

@@ -4,34 +4,25 @@ Custom HTML website, served using thttpd
 
 <!-- metadata -->
 * **Category**: Apps
-* **Status**: 0, work-in-progress
+* **Status**: 2, stable
-* **Image**: [`thttpd`](https://hub.docker.com/r/dragas/thttpd), 2, 3rd party image
+* **Image**: [`static-web-server`](https://hub.docker.com/r/joseluisq/static-web-server/), 4, upstream
 * **Healthcheck**: No
 * **Backups**: No
 * **Email**: N/A
 * **Tests**: 0
-* **SSO**: 3 (OAuth)
+* **SSO**: 1, Optional traefik forward auth
 <!-- endmetadata -->
 
 ## Basic usage
 
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
-3. `abra app new custom-html`
+3. `abra app new custom-html-tiny`
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
+4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
+5. `abra app deploy YOURAPPDOMAIN`
 6. Copy your files to the container, using something like
 ```
-abra app YOURAPPDOMAIN cp index.html app:/content
+abra app cp YOURAPPDOMAIN index.html app:/var/www/http
 ```
 
-[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
-[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
-
-## Git Based Usage
-
-1. Set up as above, stop at step 4.
-2. Deploy `swarm-cronjob` to the host
-3. `abra app config`, Uncomment Git lines in configuration, and set variables as appropriate.
-4. `abra app YOURAPPDOMAIN deploy`

compose.git-pull.yml

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

compose.http.yml

@@ -0,0 +1,8 @@
+version: "3.8"
+
+services:
+  app:
+    deploy:
+      labels:
+        - "traefik.http.routers.${STACK_NAME}_http.entrypoints=web"
+        - "traefik.http.routers.${STACK_NAME}_http.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"

compose.yml

@@ -3,8 +3,8 @@ version: "3.8"
 
 services:
   app:
-    image: dragas/thttpd
+    image: joseluisq/static-web-server:2.43.0
-    command:  ["-D", "-l", "/dev/stderr", "-d", "/var/www/http/$HTTP_SUBDIR"]
+    command:  ["-a", "0.0.0.0", "-p", "80", "-g", "warn", "-d", "/var/www/http/$HTTP_SUBDIR"]
     networks:
       - proxy
     deploy:
@@ -12,12 +12,13 @@ services:
         condition: on-failure
       labels:
         - "traefik.enable=true"
+        - "traefik.swarm.network=proxy"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         # Redirect from EXTRA_DOMAINS to DOMAIN
-        - "coop-cloud.${STACK_NAME}.version=1.2.1+1.21.6"
+        - "coop-cloud.${STACK_NAME}.version=1.2.0+2.43.0"
     environment:
       - HTTP_SUBDIR
     volumes:

release/1.0.0+2.38.0

@@ -0,0 +1 @@
+This switches from thttpd to the more reliable SWS