From 07e57c50229417276ebef84c3e275f06f16434d6 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 18 Oct 2022 17:28:22 -0400
Subject: [PATCH 01/29] Add backupbot config

---
 compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compose.yml b/compose.yml
index 5b0ea75..8da7610 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,6 +32,8 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
+        - "backupbot.backup=true"
+        - "backupbot.backup.path=/home/node/.wiki"
         - "coop-cloud.${STACK_NAME}.version=0.1.0+1.0.13"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
-- 
2.52.0


From 23c2238460d3cf60d2b0a2416e0e5073491c8a4f Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Wed, 7 Dec 2022 19:21:59 -0800
Subject: [PATCH 02/29] Switch to our forked image

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 8da7610..7b682bd 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: dobbs/farm:1.0.13
+    image: git.coopcloud.tech/wiki-cafe/farm-docker:latest
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
-- 
2.52.0


From 777cb6263e6667e72f0970e08ea9d30afdd06b64 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Wed, 7 Dec 2022 19:30:47 -0800
Subject: [PATCH 03/29] Fix image path

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 7b682bd..43ac570 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: git.coopcloud.tech/wiki-cafe/farm-docker:latest
+    image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
-- 
2.52.0


From 3b6879415fe74d06484d75b109548e1d69daf5fa Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Thu, 29 Dec 2022 11:56:42 -0800
Subject: [PATCH 04/29] Add optional compose file for `lib` persistence

---
 .env.sample     |  7 ++++++-
 compose.lib.yml | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 compose.lib.yml

diff --git a/.env.sample b/.env.sample
index 7f1e5a4..2f42aa8 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,8 +5,13 @@ DOMAIN=federatedwiki.example.com
 #EXTRA_DOMAINS=', `www.federatedwiki.example.com`'
 LETS_ENCRYPT_ENV=production
 
+COMPOSE_FILE="compose.yml"
+
 # Predefined "owner" security
-#COMPOSE_FILE="compose.yml:compose.owner.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.owner.yml"
+
+# Persistent "lib" volume
+#COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml"
 
 COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh"
 AUTHOR="Baja Colorado"
diff --git a/compose.lib.yml b/compose.lib.yml
new file mode 100644
index 0000000..5de1e75
--- /dev/null
+++ b/compose.lib.yml
@@ -0,0 +1,10 @@
+---
+version: "3.8"
+
+services:
+  app:
+    volumes:
+      - "fedwiki_lib:/home/node/lib"
+
+volumes:
+  fedwiki_lib:
-- 
2.52.0


From caa7b8a02e0ec0bf013155005e5e1f4d5b2f3c8d Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Thu, 19 Jan 2023 16:02:27 -0800
Subject: [PATCH 05/29] Update abra syntax in examples (finally) [mass update]

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e820ab0..30f8cef 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,9 @@ Share pages circulating within a creative commons
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
 3. `abra app new federatedwiki`
-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`
 
 [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
 [`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
-- 
2.52.0


From 8454597fca70a425a24dc7b533265670bfd898a0 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Fri, 20 Jan 2023 10:45:03 -0800
Subject: [PATCH 06/29] Add CI and catalogue generation [mass update]

---
 .drone.yml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..f3d2636
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,38 @@
+---
+kind: pipeline
+name: deploy to swarm-test.autonomic.zone
+steps:
+  - name: deployment
+    image: decentral1se/stack-ssh-deploy:latest
+    settings:
+      host: swarm-test.autonomic.zone
+      stack: federatedwiki
+      generate_secrets: true
+      purge: true
+      deploy_key:
+        from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
+    environment:
+      DOMAIN: federatedwiki.swarm-test.autonomic.zone
+      STACK_NAME: federatedwiki
+      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:
+        - coop-cloud/auto-recipes-catalogue-json
+
+trigger:
+  event: tag
-- 
2.52.0


From 0a21e11116eefc6e752861322c699321e47fdd35 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Fri, 20 Jan 2023 21:32:06 -0800
Subject: [PATCH 07/29] Add drone configs / secrets [mass update]

---
 .drone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index f3d2636..667f366 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,6 +17,9 @@ steps:
       DOMAIN: federatedwiki.swarm-test.autonomic.zone
       STACK_NAME: federatedwiki
       LETS_ENCRYPT_ENV: production
+      INSTALL_SH_VERSION: v1
+      CONFIG_JSON_VERSION: v1
+      CONFIG_OWNER_JSON_VERSION: v1
 trigger:
   branch:
     - main
-- 
2.52.0


From efebc41519cf53cef05de4612a4b9b977fa20aec Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sat, 21 Jan 2023 11:49:55 -0800
Subject: [PATCH 08/29] Switch to self-hosted stack-ssh-deploy image [mass
 update]

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 667f366..16e22df 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,7 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: federatedwiki
-- 
2.52.0


From 32559a5aea83f0a92a66950f27c19d338fda27f9 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 20 Jun 2023 18:21:43 +0100
Subject: [PATCH 09/29] Make custom wikicafe image optional, non-default

---
 .env.sample          | 3 +++
 compose.wikicafe.yml | 6 ++++++
 compose.yml          | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 compose.wikicafe.yml

diff --git a/.env.sample b/.env.sample
index 2f42aa8..ca9f479 100644
--- a/.env.sample
+++ b/.env.sample
@@ -7,6 +7,9 @@ LETS_ENCRYPT_ENV=production
 
 COMPOSE_FILE="compose.yml"
 
+# custom wiki.cafe image, for working oauth2 support
+#COMPOSE_FILE="$COMPOSE_FILE:compose.wikicafe.yml"
+
 # Predefined "owner" security
 #COMPOSE_FILE="$COMPOSE_FILE:compose.owner.yml"
 
diff --git a/compose.wikicafe.yml b/compose.wikicafe.yml
new file mode 100644
index 0000000..7b267f5
--- /dev/null
+++ b/compose.wikicafe.yml
@@ -0,0 +1,6 @@
+---
+version: "3.8"
+
+services:
+  app:
+    image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest
diff --git a/compose.yml b/compose.yml
index 43ac570..8da7610 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest
+    image: dobbs/farm:1.0.13
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
-- 
2.52.0


From 0e24c785416081f11b767295f3b32f21fdaf965f Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 20 Jun 2023 18:22:09 +0100
Subject: [PATCH 10/29] chore: publish 0.2.0+1.0.13 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 8da7610..2d9506a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.1.0+1.0.13"
+        - "coop-cloud.${STACK_NAME}.version=0.2.0+1.0.13"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From 0633d72d7d5133eab95e05ec9e0276ceddad4afa Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 20 Jun 2023 18:22:40 +0100
Subject: [PATCH 11/29] chore: publish 0.2.1+1.0.16 release

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index 2d9506a..8897e2d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: dobbs/farm:1.0.13
+    image: dobbs/farm:1.0.16
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.0+1.0.13"
+        - "coop-cloud.${STACK_NAME}.version=0.2.1+1.0.16"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From f19a20f880c9ab5232c15bae2cae4d7cf6a22de0 Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 17:31:55 -0400
Subject: [PATCH 12/29] chore: publish 0.2.2+1.0.17 release

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index 8897e2d..e5caa92 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: dobbs/farm:1.0.16
+    image: dobbs/farm:1.0.17
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.1+1.0.16"
+        - "coop-cloud.${STACK_NAME}.version=0.2.2+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From cfee2399cff800a61cb040d754ee84917dbf1375 Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 17:41:58 -0400
Subject: [PATCH 13/29] chore: publish 0.2.3+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index e5caa92..77975d9 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.2+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.3+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From c60645a61dc506cfa40e9b7d5b2ee2b5eef42bae Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 17:51:12 -0400
Subject: [PATCH 14/29] chore: publish 0.2.4+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 77975d9..f7e5e61 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.3+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.4+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From 6e8c37c2a6c1b1cff1eeaa864a86efb68d12d8c6 Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 17:51:42 -0400
Subject: [PATCH 15/29] chore: publish 0.2.5+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index f7e5e61..b9469c5 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.4+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.5+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From 9ba3d0bc3fa38f0ba282fca51ac7027fe25671d7 Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 18:06:21 -0400
Subject: [PATCH 16/29] chore: publish 0.2.6+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index b9469c5..57b120e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.5+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.6+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From c58712f63f1f621540dc2085783f4cb43776666b Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 18:07:34 -0400
Subject: [PATCH 17/29] chore: publish 0.2.7+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 57b120e..81250b7 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.6+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.7+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From 5ecc26589b986de10d8da0f611afa24da8f15003 Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 18:09:06 -0400
Subject: [PATCH 18/29] chore: publish 0.2.8+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 81250b7..b6cd690 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.7+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.8+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From a1cdd385b47c3820e3d24d5009f7a8f3ebe0a69d Mon Sep 17 00:00:00 2001
From: Robert Best <me@Robert.Best>
Date: Wed, 21 Jun 2023 18:18:42 -0400
Subject: [PATCH 19/29] chore: publish 0.2.9+1.0.17 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index b6cd690..54d636d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,7 +34,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.priority=1"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.8+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.9+1.0.17"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From fc95658dbad28306823414b15bfa54cdc2c4423f Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sun, 20 Aug 2023 00:16:41 +0200
Subject: [PATCH 20/29] Add Caddy labels

---
 compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/compose.yml b/compose.yml
index 54d636d..6bd43c4 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,6 +32,9 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
+        - "caddy=${CADDYFILE}"
+        - "caddy.reverse_proxy={{upstreams 3000}}"
+        - "caddy.tls.on_demand=''"
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
         - "coop-cloud.${STACK_NAME}.version=0.2.9+1.0.17"
-- 
2.52.0


From 6804752d3b2e2df46d657471127610fac5a13e6e Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sun, 20 Aug 2023 00:21:54 +0200
Subject: [PATCH 21/29] Hard-code CADDYFILE

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 6bd43c4..eec86c6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,7 +32,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
-        - "caddy=${CADDYFILE}"
+        - "caddy='http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}'"
         - "caddy.reverse_proxy={{upstreams 3000}}"
         - "caddy.tls.on_demand=''"
         - "backupbot.backup=true"
-- 
2.52.0


From 45d76b05f6141f16d3366317eee9d20299e98d47 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sun, 20 Aug 2023 00:38:20 +0200
Subject: [PATCH 22/29] Fix caddy label

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index eec86c6..81ffa04 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,9 +32,9 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
-        - "caddy='http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}'"
+        - "caddy='https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}'"
         - "caddy.reverse_proxy={{upstreams 3000}}"
-        - "caddy.tls.on_demand=''"
+        - "caddy.tls.on_demand="
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
         - "coop-cloud.${STACK_NAME}.version=0.2.9+1.0.17"
-- 
2.52.0


From b0a737d69e67aea72785e32795521a96ec59b4ea Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sun, 20 Aug 2023 00:43:38 +0200
Subject: [PATCH 23/29] Attempt to appease caddy

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 81ffa04..d4fe752 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,7 +32,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
-        - "caddy='https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}'"
+        - "caddy='https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}'"
         - "caddy.reverse_proxy={{upstreams 3000}}"
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
-- 
2.52.0


From 7e15af4875affe4f27c182b03ea364807e0b2ea3 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Sun, 20 Aug 2023 16:29:53 +0200
Subject: [PATCH 24/29] Further Caddy tweaking

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index d4fe752..f303275 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,7 +32,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
-        - "caddy='https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}'"
+        - "caddy=http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}, https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}"
         - "caddy.reverse_proxy={{upstreams 3000}}"
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
-- 
2.52.0


From b28d08551ee6ce1fd11bbe047163c11e68a5aa5d Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 22 Aug 2023 18:04:25 +0200
Subject: [PATCH 25/29] chore: publish 0.2.10+1.0.18 release

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index f303275..4a46f40 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: dobbs/farm:1.0.17
+    image: dobbs/farm:1.0.18
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
@@ -37,7 +37,7 @@ services:
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.9+1.0.17"
+        - "coop-cloud.${STACK_NAME}.version=0.2.10+1.0.18"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0


From 98ef8f18d3a65ccf46432a4232a443b3f80647af Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 22 Aug 2023 18:48:13 +0200
Subject: [PATCH 26/29] Add configurable bind-mount option

---
 .env.sample | 5 ++++-
 compose.yml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index ca9f479..0f41533 100644
--- a/.env.sample
+++ b/.env.sample
@@ -7,13 +7,16 @@ LETS_ENCRYPT_ENV=production
 
 COMPOSE_FILE="compose.yml"
 
+# Change to an absolute path to use a bind-mount, e.g. /opt/fedwiki
+FEDWIKI_VOLUME="fedwiki"
+
 # custom wiki.cafe image, for working oauth2 support
 #COMPOSE_FILE="$COMPOSE_FILE:compose.wikicafe.yml"
 
 # Predefined "owner" security
 #COMPOSE_FILE="$COMPOSE_FILE:compose.owner.yml"
 
-# Persistent "lib" volume
+# persistent lib volume / node_modules directory, e.g. for plugmatic
 #COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml"
 
 COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh"
diff --git a/compose.yml b/compose.yml
index 4a46f40..e72d6c6 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,7 +7,7 @@ services:
     command: /bin/sh config/install.sh
     volumes:
       - "fedwiki_friends:/home/node/config"
-      - "fedwiki:/home/node/.wiki"
+      - "${FEDWIKI_VOLUME}:/home/node/.wiki"
     networks:
       - proxy
     configs:
-- 
2.52.0


From 33a740929d7e453baa002e8575b0d435aad734b7 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 22 Aug 2023 18:50:50 +0200
Subject: [PATCH 27/29] chore: publish 1.0.0+1.0.18 release

---
 compose.yml          | 2 +-
 release/1.0.0+1.0.18 | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 release/1.0.0+1.0.18

diff --git a/compose.yml b/compose.yml
index e72d6c6..5d2ad1d 100644
--- a/compose.yml
+++ b/compose.yml
@@ -37,7 +37,7 @@ services:
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=0.2.10+1.0.18"
+        - "coop-cloud.${STACK_NAME}.version=1.0.0+1.0.18"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
diff --git a/release/1.0.0+1.0.18 b/release/1.0.0+1.0.18
new file mode 100644
index 0000000..1d777c6
--- /dev/null
+++ b/release/1.0.0+1.0.18
@@ -0,0 +1,7 @@
+WARNING! 🚨
+
+There is a new mandatory config option, FEDWIKI_VOLUME -- please copy the
+default value from the recipe .env.sample to your .env file on upgrade.
+
+If you haven't done that yet, best to bail with Ctrl+C, then add the option,
+then re-run this `abra app upgrade ...` command
-- 
2.52.0


From 03cdb435dd67e9d20f3c97e29a8e786b4d624c70 Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 22 Aug 2023 19:14:04 +0200
Subject: [PATCH 28/29] Remove HTTP

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index 5d2ad1d..ce1f79a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -32,7 +32,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].main=${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.tls.domains[0].sans=*.${DOMAIN}"
         - "traefik.http.routers.${STACK_NAME}.priority=1"
-        - "caddy=http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}, https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}"
+        - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}"
         - "caddy.reverse_proxy={{upstreams 3000}}"
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
-- 
2.52.0


From e90183f15305ddd225f264b443f6f071da9dac6b Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Tue, 22 Aug 2023 19:15:13 +0200
Subject: [PATCH 29/29] chore: publish 1.0.1+1.0.18 release

---
 compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yml b/compose.yml
index ce1f79a..5a0f3c5 100644
--- a/compose.yml
+++ b/compose.yml
@@ -37,7 +37,7 @@ services:
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=1.0.0+1.0.18"
+        - "coop-cloud.${STACK_NAME}.version=1.0.1+1.0.18"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost"]
     #   interval: 30s
-- 
2.52.0