chore: publish 2.1.3+1.0.26 release

.env.sample

@@ -19,3 +19,6 @@ FEDWIKI_VOLUME="fedwiki"
 # Note(3wc): If you change this after initial deployment, you will need to
 # manually copy the new value from `conf/config.initial.json`
 SECRET_COOKIE_SECRET_VERSION=v1  # length=30
+
+# Disable SSL encryption (not recommended) 
+#COMPOSE_FILE="$COMPOSE_FILE:compose.insecure.yml"

compose.insecure.yml

@@ -0,0 +1,11 @@
+---
+version: "3.8"
+
+services:
+  app:
+    deploy:
+      labels:
+        - "traefik.http.services.${STACK_NAME}-non-tls.loadbalancer.server.port=3000"
+        - "traefik.http.routers.${STACK_NAME}-non-tls.rule=Host(`${DOMAIN}`) || HostRegexp(`{subdomain:\\w+}.${DOMAIN}`) || HostRegexp(`{subsubdomain:\\w+}.{subdomain:\\w+}.${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}-non-tls.entrypoints=web"
+        - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, http://${DOMAIN}, http://*.${DOMAIN}, http://*.*.${DOMAIN}, http://*.*.*.${DOMAIN}"

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: dobbs/farm:1.0.20
+    image: dobbs/farm:1.0.26
     command: /bin/sh entrypoint.sh
     volumes:
       - "${FEDWIKI_VOLUME}:/home/node/.wiki"
@@ -40,9 +40,9 @@ services:
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=2.0.0+1.0.20"
+        - "coop-cloud.${STACK_NAME}.version=2.1.3+1.0.26"
     healthcheck:
-      test: "node -e 'var http = require(\"http\"); var options = { host : \"localhost\", port : \"3000\", timeout : 2000, path : \"/welcome-visitors.html\"  }; var request = http.request(options, (res)
+      test: "node -e 'var http = require(\"http\"); var options = { host : \"localhost\", port : \"3000\", timeout : 2000, path : \"/view/welcome-visitors\", headers: { \"Host\": \"${DOMAIN}\" }  }; var request = http.request(options, (res)
  => { console.log(`STATUS: $${res.statusCode}`); if (res.statusCode == 200) {  process.exit(0); } else { process.exit(1); } }); request.on(\"error\", function(err) { console.log('ERROR'); 
 process.exit(1); }); request.end();'"
       interval: 10s

entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ ! -f .wiki/config.json ]; then
-	cp config/config.json .wiki/config.json
+	cp initial-config/config.json .wiki/config.json
 fi
 
 wiki --farm