chore: publish 2.2.2+1.0.29 release

.drone.yml

@@ -35,7 +35,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

@@ -19,3 +19,8 @@ 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"
+
+CONFIG_FILE="config.json"

abra.sh

@@ -1,2 +1,2 @@
-export ENTRYPOINT_SH_VERSION=v1
+export ENTRYPOINT_SH_VERSION=v2
 export CONFIG_INITIAL_JSON_VERSION=v1

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.29
     command: /bin/sh entrypoint.sh
     volumes:
       - "${FEDWIKI_VOLUME}:/home/node/.wiki"
@@ -40,15 +40,15 @@ services:
         - "caddy.tls.on_demand="
         - "backupbot.backup=true"
         - "backupbot.backup.path=/home/node/.wiki"
-        - "coop-cloud.${STACK_NAME}.version=2.0.1+1.0.20"
-    healthcheck:
-      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
-      timeout: 2s
-      retries: 2
-      start_period: 30s
+        - "coop-cloud.${STACK_NAME}.version=2.2.2+1.0.29"
+#     healthcheck:
+#       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
+#       timeout: 2s
+#       retries: 2
+#       start_period: 30s
 
 volumes:
   fedwiki:

entrypoint.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 
-if [ ! -f .wiki/config.json ]; then
-	cp config/config.json .wiki/config.json
+config_file="$HOME/.wiki/${CONFIG_FILE:-config.json}"
+
+if [ ! -f "$config_file" ]; then
+	cp initial-config/config.json "$config_file"
 fi
 
-wiki --farm
+wiki --farm --config "$config_file"

release/2.1.5+1.0.27

@@ -0,0 +1 @@
+y