From 2da198b21bda39529943b44f4570d22264581f06 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 5 Oct 2023 22:51:28 +0100 Subject: [PATCH 01/30] chore: publish 1.0.2+1.0.19 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 5a0f3c5..fd79e82 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.18 + image: dobbs/farm:1.0.19 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=1.0.1+1.0.18" + - "coop-cloud.${STACK_NAME}.version=1.0.2+1.0.19" # healthcheck: # test: ["CMD", "curl", "-f", "http://localhost"] # interval: 30s -- 2.49.0 From 3a0d30da6a90fc8a73fe2e71e7ec4a3c8bcc383b Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sun, 8 Oct 2023 16:57:08 +0100 Subject: [PATCH 02/30] Tidy up, add healthcheck --- .env.sample | 11 +++------ abra.sh | 25 ++------------------ compose.owner.yml | 15 ------------ compose.yml | 47 ++++++++++++++++++++++--------------- config.initial.json.tmpl | 6 +++++ config.json.tmpl | 14 ----------- config.owner.json.tmpl | 6 ----- install.sh => entrypoint.sh | 4 ---- 8 files changed, 39 insertions(+), 89 deletions(-) delete mode 100644 compose.owner.yml create mode 100644 config.initial.json.tmpl delete mode 100644 config.json.tmpl delete mode 100644 config.owner.json.tmpl rename install.sh => entrypoint.sh (51%) diff --git a/.env.sample b/.env.sample index 0f41533..fcf2dbb 100644 --- a/.env.sample +++ b/.env.sample @@ -13,14 +13,9 @@ 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 / node_modules directory, e.g. for plugmatic #COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml" -COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh" -AUTHOR="Baja Colorado" -ADMIN_KEY="" - -FEDWIKI_IS_PRIVATE=0 +# 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 diff --git a/abra.sh b/abra.sh index 7ae0733..96897a7 100644 --- a/abra.sh +++ b/abra.sh @@ -1,23 +1,2 @@ -export INSTALL_SH_VERSION=v9 -export CONFIG_JSON_VERSION=v7 -export CONFIG_OWNER_JSON_VERSION=v4 - -abra_backup_app() { - _abra_backup_dir "app:/home/node/.wiki" -} - -abra_restore_app() { - # shellcheck disable=SC2034 - { - abra__src_="-" - abra__dst_="app:/home/node/.wiki" - } - - zcat "$@" | sub_app_cp - - success "Restored 'app'" -} - -abra_backup() { - abra_backup_app -} +export ENTRYPOINT_SH_VERSION=v1 +export CONFIG_INITIAL_JSON_VERSION=v1 diff --git a/compose.owner.yml b/compose.owner.yml deleted file mode 100644 index 678205a..0000000 --- a/compose.owner.yml +++ /dev/null @@ -1,15 +0,0 @@ - ---- -version: "3.8" - -services: - app: - configs: - - source: config_owner_json_conf - target: /home/node/config/config.owner.json - -configs: - config_owner_json_conf: - name: ${STACK_NAME}_config_owner_json_${CONFIG_OWNER_JSON_VERSION} - file: config.owner.json.tmpl - template_driver: golang diff --git a/compose.yml b/compose.yml index fd79e82..2776e04 100644 --- a/compose.yml +++ b/compose.yml @@ -4,23 +4,26 @@ version: "3.8" services: app: image: dobbs/farm:1.0.19 - command: /bin/sh config/install.sh + command: /bin/sh entrypoint.sh volumes: - - "fedwiki_friends:/home/node/config" - "${FEDWIKI_VOLUME}:/home/node/.wiki" networks: - proxy configs: - - source: install_sh_conf - target: /home/node/config/install.sh - - source: config_json_conf - target: /home/node/config/config.json + - source: entrypoint_sh_conf + target: /home/node/entrypoint.sh + - source: config_json_initial_conf + target: /home/node/initial-config/config.json + secrets: + - cookie_secret environment: - DOMAIN - COOKIE_SECRET - AUTHOR - ADMIN_KEY deploy: + update_config: + order: start-first restart_policy: condition: on-failure labels: @@ -38,26 +41,32 @@ services: - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - "coop-cloud.${STACK_NAME}.version=1.0.2+1.0.19" - # healthcheck: - # test: ["CMD", "curl", "-f", "http://localhost"] - # interval: 30s - # timeout: 10s - # retries: 10 - # start_period: 1m + 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) + => { 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: - fedwiki_friends: networks: proxy: external: true +secrets: + cookie_secret: + external: true + name: ${STACK_NAME}_cookie_secret_${SECRET_COOKIE_SECRET_VERSION} + configs: - install_sh_conf: - name: ${STACK_NAME}_install_sh_${INSTALL_SH_VERSION} - file: install.sh - config_json_conf: - name: ${STACK_NAME}_config_json_${CONFIG_JSON_VERSION} - file: config.json.tmpl + entrypoint_sh_conf: + name: ${STACK_NAME}_entrypoint_sh_${ENTRYPOINT_SH_VERSION} + file: entrypoint.sh + config_json_initial_conf: + name: ${STACK_NAME}_config_initial_json_${CONFIG_INITIAL_JSON_VERSION} + file: config.initial.json.tmpl template_driver: golang diff --git a/config.initial.json.tmpl b/config.initial.json.tmpl new file mode 100644 index 0000000..b9c46a6 --- /dev/null +++ b/config.initial.json.tmpl @@ -0,0 +1,6 @@ +{ + "farm": true, + "cookieSecret": "{{ secret "cookie_secret" }}", + "secure_cookie": true, + "security_type": "friends" +} diff --git a/config.json.tmpl b/config.json.tmpl deleted file mode 100644 index 01a9642..0000000 --- a/config.json.tmpl +++ /dev/null @@ -1,14 +0,0 @@ -{ - "admin": "{{ env "ADMIN_KEY" }}", - "farm": true, - "cookieSecret": "{{ env "COOKIE_SECRET" }}", - "secure_cookie": true, - "security_type": "friends" - {{ if eq (env "FEDWIKI_IS_PRIVATE") "1" }}, - "wikiDomains": { - "$DOMAIN": { - "id": "/home/node/.wiki/config.owner.json" - } - } - {{ end }} -} diff --git a/config.owner.json.tmpl b/config.owner.json.tmpl deleted file mode 100644 index 0dae8e9..0000000 --- a/config.owner.json.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "{{ env "AUTHOR" }}", - "friend": { - "secret": "{{ env "PASSWORD" }}" - } -} diff --git a/install.sh b/entrypoint.sh similarity index 51% rename from install.sh rename to entrypoint.sh index 62b588a..fe1d99c 100644 --- a/install.sh +++ b/entrypoint.sh @@ -4,8 +4,4 @@ if [ ! -f .wiki/config.json ]; then cp config/config.json .wiki/config.json fi -if [ ! -f .wiki/config.owner.json ]; then - cp config/config.owner.json .wiki/config.owner.json -fi - wiki --farm -- 2.49.0 From a93358bd6870e52a3e1238516444f6eef5dd96ed Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 9 Oct 2023 10:46:55 +0100 Subject: [PATCH 03/30] chore: publish 2.0.0+1.0.20 release --- compose.yml | 4 ++-- release/2.0.0+1.0.20 | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 release/2.0.0+1.0.20 diff --git a/compose.yml b/compose.yml index 2776e04..7ac1118 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.19 + image: dobbs/farm:1.0.20 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=1.0.2+1.0.19" + - "coop-cloud.${STACK_NAME}.version=2.0.0+1.0.20" 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) => { console.log(`STATUS: $${res.statusCode}`); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } }); request.on(\"error\", function(err) { console.log('ERROR'); diff --git a/release/2.0.0+1.0.20 b/release/2.0.0+1.0.20 new file mode 100644 index 0000000..f687d96 --- /dev/null +++ b/release/2.0.0+1.0.20 @@ -0,0 +1,11 @@ +COOKIE_SECRET is now a Docker secret, and several config options have been +dropped from the recipe -- this shouldn't affect running deplyoments, as +the recipe currently just installs the generated `config.json` if there isn't +one already -- but you will likely still need to run +`abra app secret generate ...` before deploying, in preparation for moving to +ennvironment variables for config in a future release. + +Additionally, there is now a healthcheck, which may require tuning, especially +on slower systems; please open a ticket on [the issue +tracker](https://git.coopcloud.tech/coop-cloud/federatedwiki/issues) if you +notice problems with the containers starting up. -- 2.49.0 From d080b8c09b5f8ddde4e226ab40f725d0c364b33e Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 9 Oct 2023 11:08:01 +0100 Subject: [PATCH 04/30] Fix healthcheck --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 7ac1118..170de90 100644 --- a/compose.yml +++ b/compose.yml @@ -42,7 +42,7 @@ services: - "backupbot.backup.path=/home/node/.wiki" - "coop-cloud.${STACK_NAME}.version=2.0.0+1.0.20" 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 -- 2.49.0 From a7bda15182143aa4d588b63a3a9b6b5053d04591 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 9 Oct 2023 11:08:21 +0100 Subject: [PATCH 05/30] chore: publish 2.0.1+1.0.20 release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 170de90..d9110a4 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ 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.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'); -- 2.49.0 From 53ab8dbf39e943042e9098971fd5f18877e6f69e Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 22 Nov 2023 17:15:54 +0000 Subject: [PATCH 06/30] chore: publish 2.0.2+1.0.21 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index d9110a4..cebfce6 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.20 + image: dobbs/farm:1.0.21 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ 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" + - "coop-cloud.${STACK_NAME}.version=2.0.2+1.0.21" 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'); -- 2.49.0 From 5d55c3e70ddfe5a55ee15174dadc0356ee9bc3f9 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 27 Feb 2024 14:26:07 -0300 Subject: [PATCH 07/30] chore: publish 2.0.3+1.0.22 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index cebfce6..3bf5b17 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.21 + image: dobbs/farm:1.0.22 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.0.2+1.0.21" + - "coop-cloud.${STACK_NAME}.version=2.0.3+1.0.22" 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'); -- 2.49.0 From b302384ad00e67ebdcd65d6541278a41e70d041d Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 5 Apr 2024 11:28:58 -0300 Subject: [PATCH 08/30] chore: publish 2.0.4+1.0.24 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 3bf5b17..d1abb1b 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.22 + image: dobbs/farm:1.0.24 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.0.3+1.0.22" + - "coop-cloud.${STACK_NAME}.version=2.0.4+1.0.24" 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'); -- 2.49.0 From ce991f453e624da2887d03431f64c4e6032845fd Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 5 Apr 2024 11:46:38 -0300 Subject: [PATCH 09/30] Add compose.insecure.yml --- .env.sample | 3 +++ compose.insecure.yml | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 compose.insecure.yml diff --git a/.env.sample b/.env.sample index fcf2dbb..908262b 100644 --- a/.env.sample +++ b/.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" diff --git a/compose.insecure.yml b/compose.insecure.yml new file mode 100644 index 0000000..727ee92 --- /dev/null +++ b/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}" -- 2.49.0 From a8fe0246354185c40a76a526510e932b85b05aae Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 5 Apr 2024 11:48:01 -0300 Subject: [PATCH 10/30] chore: publish 2.1.0+1.0.24 release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index d1abb1b..eee6a81 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.0.4+1.0.24" + - "coop-cloud.${STACK_NAME}.version=2.1.0+1.0.24" 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'); -- 2.49.0 From caa49701a97425bc8fc3019477705ff07eeb6aa0 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sun, 12 May 2024 14:14:45 -0300 Subject: [PATCH 11/30] chore: publish 2.1.1+1.0.25 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index eee6a81..3023c35 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.24 + image: dobbs/farm:1.0.25 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.0+1.0.24" + - "coop-cloud.${STACK_NAME}.version=2.1.1+1.0.25" 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'); -- 2.49.0 From 866c46f20dd031cf8e4df6a77afe220bb38591f8 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 11 Jun 2024 11:27:24 -0500 Subject: [PATCH 12/30] chore: publish 2.1.2+1.0.26 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 3023c35..fd62442 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.25 + image: dobbs/farm:1.0.26 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.1+1.0.25" + - "coop-cloud.${STACK_NAME}.version=2.1.2+1.0.26" 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'); -- 2.49.0 From c3e117bcdf1815cbbd80e6169f1f85fa457d3179 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 23 Jul 2024 12:43:06 -0400 Subject: [PATCH 13/30] chore: publish 2.1.3+1.0.26 release --- compose.yml | 2 +- entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index fd62442..9a7d855 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.2+1.0.26" + - "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 : \"/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'); diff --git a/entrypoint.sh b/entrypoint.sh index fe1d99c..81411bc 100644 --- a/entrypoint.sh +++ b/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 -- 2.49.0 From bec1a545811243a2e24c2f7cbe800faa666e767b Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 23 Jul 2024 12:52:30 -0400 Subject: [PATCH 14/30] chore: publish 2.1.4+1.0.26 release --- abra.sh | 2 +- compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abra.sh b/abra.sh index 96897a7..f99cbc4 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ -export ENTRYPOINT_SH_VERSION=v1 +export ENTRYPOINT_SH_VERSION=v2 export CONFIG_INITIAL_JSON_VERSION=v1 diff --git a/compose.yml b/compose.yml index 9a7d855..a6d90b6 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.3+1.0.26" + - "coop-cloud.${STACK_NAME}.version=2.1.4+1.0.26" 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'); -- 2.49.0 From 1a1384177a9a1d5453c350192368d644e4d60218 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 6 Aug 2024 13:36:24 -0400 Subject: [PATCH 15/30] chore: publish 2.1.5+1.0.27 release --- compose.yml | 4 ++-- release/2.1.5+1.0.27 | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 release/2.1.5+1.0.27 diff --git a/compose.yml b/compose.yml index a6d90b6..680605e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.26 + image: dobbs/farm:1.0.27 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.4+1.0.26" + - "coop-cloud.${STACK_NAME}.version=2.1.5+1.0.27" 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'); diff --git a/release/2.1.5+1.0.27 b/release/2.1.5+1.0.27 new file mode 100644 index 0000000..e25f181 --- /dev/null +++ b/release/2.1.5+1.0.27 @@ -0,0 +1 @@ +y \ No newline at end of file -- 2.49.0 From 6790fa45afaabafa8c7e9c71236acb3a022a8df3 Mon Sep 17 00:00:00 2001 From: bortseb Date: Tue, 17 Sep 2024 19:50:55 +0000 Subject: [PATCH 16/30] chore: publish 2.1.6+1.0.28 release --- .env.sample | 3 +++ compose.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index 908262b..b8ce971 100644 --- a/.env.sample +++ b/.env.sample @@ -16,6 +16,9 @@ FEDWIKI_VOLUME="fedwiki" # persistent lib volume / node_modules directory, e.g. for plugmatic #COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml" +# persistent lib volume / node_modules directory for use when using a "private" Login to View system +#COMPOSE_FILE="$COMPOSE_FILE:compose.lib-private.yml" + # 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 diff --git a/compose.yml b/compose.yml index 680605e..48fcc02 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.27 + image: dobbs/farm:1.0.28 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.5+1.0.27" + - "coop-cloud.${STACK_NAME}.version=2.1.6+1.0.28" 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'); -- 2.49.0 From 61e96089f14f1526a1a44d0d9dc4c80e4f4b7cfb Mon Sep 17 00:00:00 2001 From: bortseb Date: Tue, 17 Sep 2024 20:48:18 +0000 Subject: [PATCH 17/30] chore: publish 2.1.7+1.0.28 release --- compose.lib-private.yml | 10 ++++++++++ compose.yml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 compose.lib-private.yml diff --git a/compose.lib-private.yml b/compose.lib-private.yml new file mode 100644 index 0000000..e3514f6 --- /dev/null +++ b/compose.lib-private.yml @@ -0,0 +1,10 @@ +--- +version: "3.8" + +services: + app: + volumes: + - "fedwiki-private_lib:/home/node/lib" + +volumes: + fedwiki-private_lib: diff --git a/compose.yml b/compose.yml index 48fcc02..a84147c 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.6+1.0.28" + - "coop-cloud.${STACK_NAME}.version=2.1.7+1.0.28" 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'); -- 2.49.0 From 2ac052366a423322104a312503bf58c7fc6d309f Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 24 Sep 2024 13:19:43 -0400 Subject: [PATCH 18/30] Add support for specifying config file location --- .env.sample | 2 ++ entrypoint.sh | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env.sample b/.env.sample index b8ce971..f66476e 100644 --- a/.env.sample +++ b/.env.sample @@ -25,3 +25,5 @@ SECRET_COOKIE_SECRET_VERSION=v1 # length=30 # Disable SSL encryption (not recommended) #COMPOSE_FILE="$COMPOSE_FILE:compose.insecure.yml" + +CONFIG_FILE="config.json" diff --git a/entrypoint.sh b/entrypoint.sh index 81411bc..0a2806a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,9 @@ #!/bin/sh -if [ ! -f .wiki/config.json ]; then - cp initial-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" -- 2.49.0 From b849a3b536ddc359b79ffc75d4b19d722719c4a3 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 24 Sep 2024 15:11:46 -0400 Subject: [PATCH 19/30] Drop separate lib volume for now --- .env.sample | 3 --- compose.lib-private.yml | 10 ---------- 2 files changed, 13 deletions(-) delete mode 100644 compose.lib-private.yml diff --git a/.env.sample b/.env.sample index f66476e..b137390 100644 --- a/.env.sample +++ b/.env.sample @@ -16,9 +16,6 @@ FEDWIKI_VOLUME="fedwiki" # persistent lib volume / node_modules directory, e.g. for plugmatic #COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml" -# persistent lib volume / node_modules directory for use when using a "private" Login to View system -#COMPOSE_FILE="$COMPOSE_FILE:compose.lib-private.yml" - # 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 diff --git a/compose.lib-private.yml b/compose.lib-private.yml deleted file mode 100644 index e3514f6..0000000 --- a/compose.lib-private.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: "3.8" - -services: - app: - volumes: - - "fedwiki-private_lib:/home/node/lib" - -volumes: - fedwiki-private_lib: -- 2.49.0 From 27f81a3e81e679f4d21a05444d7b2417dcb0ff32 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 24 Sep 2024 16:03:02 -0400 Subject: [PATCH 20/30] chore: publish 2.2.0+1.0.28 release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index a84147c..f3859a2 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.1.7+1.0.28" + - "coop-cloud.${STACK_NAME}.version=2.2.0+1.0.28" 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'); -- 2.49.0 From a304f8904217f5296aa8befefbdfc4c660f8a073 Mon Sep 17 00:00:00 2001 From: Cassowary Date: Wed, 8 Jan 2025 10:09:12 -0800 Subject: [PATCH 21/30] Update .drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 16e22df..4bca029 100644 --- a/.drone.yml +++ b/.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 -- 2.49.0 From 58c8bba02ec1f12fd10c25f08cff240583aa38a0 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 3 Feb 2025 23:21:48 -0500 Subject: [PATCH 22/30] chore: publish 2.2.1+1.0.29 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index f3859a2..076cfd9 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.28 + image: dobbs/farm:1.0.29 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.2.0+1.0.28" + - "coop-cloud.${STACK_NAME}.version=2.2.1+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'); -- 2.49.0 From 19b698087e10bfa588390cd2686cf62f4093f4d9 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 3 Feb 2025 23:22:10 -0500 Subject: [PATCH 23/30] Disable healthcheck for now --- compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/compose.yml b/compose.yml index 076cfd9..6e4a10e 100644 --- a/compose.yml +++ b/compose.yml @@ -41,14 +41,14 @@ services: - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - "coop-cloud.${STACK_NAME}.version=2.2.1+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 +# 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: -- 2.49.0 From 8807f46e7ca2aab20bf38e1392ec284c614a8ae6 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 3 Feb 2025 23:22:34 -0500 Subject: [PATCH 24/30] chore: publish 2.2.2+1.0.29 release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 6e4a10e..95e1694 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.2.1+1.0.29" + - "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'); -- 2.49.0 From fc242b51bb9cb9471c193183b0c0c5f8f23b762e Mon Sep 17 00:00:00 2001 From: bortseb Date: Thu, 22 May 2025 04:00:51 +0000 Subject: [PATCH 25/30] chore: publish 2.3.0+1.1.1 release --- compose.yml | 4 ++-- release/2.3.0+1.1.1 | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 release/2.3.0+1.1.1 diff --git a/compose.yml b/compose.yml index 95e1694..9fc43da 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.0.29 + image: dobbs/farm:1.1.1 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.2.2+1.0.29" + - "coop-cloud.${STACK_NAME}.version=2.3.0+1.1.1" # 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'); diff --git a/release/2.3.0+1.1.1 b/release/2.3.0+1.1.1 new file mode 100644 index 0000000..ff64bfd --- /dev/null +++ b/release/2.3.0+1.1.1 @@ -0,0 +1 @@ +decaffeinated \ No newline at end of file -- 2.49.0 From 64687083e9e67112369111e560cbe1ea3b8fbe5d Mon Sep 17 00:00:00 2001 From: bortseb Date: Fri, 23 May 2025 14:13:36 +0000 Subject: [PATCH 26/30] chore: publish 2.4.0+1.1.1 release --- compose.yml | 2 +- release/2.4.0+1.1.1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 release/2.4.0+1.1.1 diff --git a/compose.yml b/compose.yml index 9fc43da..d69fd52 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.3.0+1.1.1" + - "coop-cloud.${STACK_NAME}.version=2.4.0+1.1.1" # 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'); diff --git a/release/2.4.0+1.1.1 b/release/2.4.0+1.1.1 new file mode 100644 index 0000000..7761f3f --- /dev/null +++ b/release/2.4.0+1.1.1 @@ -0,0 +1 @@ +decaffeinate \ No newline at end of file -- 2.49.0 From 79cab1876075b67b8a52fe6709c59cdba3b55fea Mon Sep 17 00:00:00 2001 From: bortseb Date: Fri, 30 May 2025 16:01:05 +0000 Subject: [PATCH 27/30] chore: publish 2.5.0+1.1.1 release --- compose.yml | 2 +- release/2.5.0+1.1.1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 release/2.5.0+1.1.1 diff --git a/compose.yml b/compose.yml index d69fd52..6ea4475 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.4.0+1.1.1" + - "coop-cloud.${STACK_NAME}.version=2.5.0+1.1.1" # 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'); diff --git a/release/2.5.0+1.1.1 b/release/2.5.0+1.1.1 new file mode 100644 index 0000000..7761f3f --- /dev/null +++ b/release/2.5.0+1.1.1 @@ -0,0 +1 @@ +decaffeinate \ No newline at end of file -- 2.49.0 From dba2f0f43099fffc4a36dcc4524975cde47f0c62 Mon Sep 17 00:00:00 2001 From: bortseb Date: Mon, 2 Jun 2025 17:05:05 +0000 Subject: [PATCH 28/30] chore: publish 2.6.0+1.1.1 release --- compose.yml | 2 +- release/2.6.0+1.1.1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 release/2.6.0+1.1.1 diff --git a/compose.yml b/compose.yml index 6ea4475..d880241 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.5.0+1.1.1" + - "coop-cloud.${STACK_NAME}.version=2.6.0+1.1.1" # 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'); diff --git a/release/2.6.0+1.1.1 b/release/2.6.0+1.1.1 new file mode 100644 index 0000000..ff64bfd --- /dev/null +++ b/release/2.6.0+1.1.1 @@ -0,0 +1 @@ +decaffeinated \ No newline at end of file -- 2.49.0 From 2ed2c42036876811bfb1c06486136b8486e594db Mon Sep 17 00:00:00 2001 From: bortseb Date: Mon, 2 Jun 2025 17:16:21 +0000 Subject: [PATCH 29/30] chore: publish 2.7.0+1.1.1 release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index d880241..4972c38 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.6.0+1.1.1" + - "coop-cloud.${STACK_NAME}.version=2.7.0+1.1.1" # 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'); -- 2.49.0 From 9c8caba4e2170a60811d12966706f38310b7b702 Mon Sep 17 00:00:00 2001 From: bortseb Date: Fri, 20 Jun 2025 16:36:57 +0000 Subject: [PATCH 30/30] chore: publish 2.7.1+1.1.2 release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 4972c38..70536cc 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: dobbs/farm:1.1.1 + image: dobbs/farm:1.1.2 command: /bin/sh entrypoint.sh volumes: - "${FEDWIKI_VOLUME}:/home/node/.wiki" @@ -40,7 +40,7 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - - "coop-cloud.${STACK_NAME}.version=2.7.0+1.1.1" + - "coop-cloud.${STACK_NAME}.version=2.7.1+1.1.2" # 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'); -- 2.49.0