From fb0eb1f4cd9fbb66a3c750164ec18a53a521fb4c Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 26 Mar 2024 13:32:41 -0300
Subject: [PATCH] Add TLS "ask"

---
 .env.sample                |  6 ++++++
 compose.ask-filesystem.yml | 27 +++++++++++++++++++++++++++
 compose.yml                |  8 --------
 3 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 compose.ask-filesystem.yml

diff --git a/.env.sample b/.env.sample
index c4cf07f..7630c2a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -3,3 +3,9 @@ TYPE=caddy
 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
diff --git a/compose.ask-filesystem.yml b/compose.ask-filesystem.yml
new file mode 100644
index 0000000..b8a7a02
--- /dev/null
+++ b/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_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}
diff --git a/compose.yml b/compose.yml
index e848dd6..063c752 100644
--- a/compose.yml
+++ b/compose.yml
@@ -17,7 +17,6 @@ services:
     deploy:
       labels:
         - "caddy.email=${LE_EMAIL}"
-        - "caddy.on_demand_tls.ask=http://localhost:9876"
         - "coop-cloud.${STACK_NAME}.version=0.1.2+2.8.6-alpine"
 
 networks:
@@ -26,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: