Update .drone.yml

.drone.yml

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

.env.sample

@@ -1,10 +1,13 @@
 TYPE=caddy
 
-DOMAIN=caddy.example.com
-
-## Domain aliases
-#EXTRA_DOMAINS=', `www.caddy.example.com`'
-
 LETS_ENCRYPT_ENV=production
 
 LE_EMAIL=certs@example.com
+
+COMPOSE_FILE="compose.yml"
+
+# TLS "ask" from filesystem
+#COMPOSE_FILE="$COMPOSE_FILE:compose.ask-filesystem.yml"
+#ASK_VOLUME=fedwiki_data
+#or:
+#ASK_VOLUME_BIND=/opt/fedwiki

compose.ask-filesystem.yml

@@ -0,0 +1,27 @@
+---
+version: "3.8"
+
+services:
+  ask:
+    image: git.coopcloud.tech/wiki-cafe/caddy-ask-filesystem:latest
+    environment:
+      - DIRECTORY=/data
+      - ADDRESS=0.0.0.0
+    volumes:
+      - "${ASK_VOLUME_BIND:-ask_data}:/data"
+    networks:
+      - backend
+  app:
+    networks:
+      - backend
+    deploy:
+      labels:
+        - "caddy.on_demand_tls.ask=http://${STACK_NAME}_ask:3000/"
+
+networks:
+  backend:
+
+volumes:
+  ask_data:
+    external: true
+    name: ${ASK_VOLUME}

compose.yml

@@ -17,9 +17,7 @@ services:
     deploy:
       labels:
         - "caddy.email=${LE_EMAIL}"
-        - "caddy.on_demand_tls.ask=http://localhost:9876"
+        - "coop-cloud.${STACK_NAME}.version=0.2.1+2.8.6-alpine"
-        - "coop-cloud.${STACK_NAME}.version=0.1.1+2.8.6-alpine"
-
 
 networks:
   proxy:
@@ -27,10 +25,3 @@ networks:
 
 volumes:
   caddy_data:
-
-configs:
-  caddy_tls_ask:
-    name: ${STACK_NAME}_caddy_tls_ask_${CADDY_TLS_ASK_CONF_VERSION}
-    file: ./tls-ask.caddyfile
-    labels:
-      caddy: