From 826a25edb39c850b25390294b621bea98909ae04 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Sat, 9 Sep 2023 05:21:00 +0000 Subject: [PATCH 01/14] un-abra --- .drone.yml | 41 ------------------- .env.sample | 26 ------------ .gitignore | 2 +- abra.sh | 23 ----------- compose.lib.yml => compose.lib.yaml | 3 -- compose.owner.yml => compose.owner.yaml | 6 +-- compose.wikicafe.yml => compose.wikicafe.yaml | 3 -- compose.yml => compose.yaml | 8 +--- release/1.0.0+1.0.18 | 7 ---- 9 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 .drone.yml delete mode 100644 .env.sample delete mode 100644 abra.sh rename compose.lib.yml => compose.lib.yaml (82%) rename compose.owner.yml => compose.owner.yaml (70%) rename compose.wikicafe.yml => compose.wikicafe.yaml (78%) rename compose.yml => compose.yaml (90%) delete mode 100644 release/1.0.0+1.0.18 diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 16e22df..0000000 --- a/.drone.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -kind: pipeline -name: deploy to swarm-test.autonomic.zone -steps: - - name: deployment - image: git.coopcloud.tech/coop-cloud/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 - INSTALL_SH_VERSION: v1 - CONFIG_JSON_VERSION: v1 - CONFIG_OWNER_JSON_VERSION: v1 -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 diff --git a/.env.sample b/.env.sample deleted file mode 100644 index 0f41533..0000000 --- a/.env.sample +++ /dev/null @@ -1,26 +0,0 @@ -TYPE=federatedwiki - -DOMAIN=federatedwiki.example.com -## Domain aliases -#EXTRA_DOMAINS=', `www.federatedwiki.example.com`' -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 / 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 diff --git a/.gitignore b/.gitignore index 37b52cc..4c49bd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/.envrc +.env diff --git a/abra.sh b/abra.sh deleted file mode 100644 index 7ae0733..0000000 --- a/abra.sh +++ /dev/null @@ -1,23 +0,0 @@ -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 -} diff --git a/compose.lib.yml b/compose.lib.yaml similarity index 82% rename from compose.lib.yml rename to compose.lib.yaml index 5de1e75..e5a6ecb 100644 --- a/compose.lib.yml +++ b/compose.lib.yaml @@ -1,6 +1,3 @@ ---- -version: "3.8" - services: app: volumes: diff --git a/compose.owner.yml b/compose.owner.yaml similarity index 70% rename from compose.owner.yml rename to compose.owner.yaml index 678205a..10ee306 100644 --- a/compose.owner.yml +++ b/compose.owner.yaml @@ -1,7 +1,3 @@ - ---- -version: "3.8" - services: app: configs: @@ -10,6 +6,6 @@ services: configs: config_owner_json_conf: - name: ${STACK_NAME}_config_owner_json_${CONFIG_OWNER_JSON_VERSION} + name: ${STACK_NAME}_config_owner_json file: config.owner.json.tmpl template_driver: golang diff --git a/compose.wikicafe.yml b/compose.wikicafe.yaml similarity index 78% rename from compose.wikicafe.yml rename to compose.wikicafe.yaml index 7b267f5..301d72a 100644 --- a/compose.wikicafe.yml +++ b/compose.wikicafe.yaml @@ -1,6 +1,3 @@ ---- -version: "3.8" - services: app: image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest diff --git a/compose.yml b/compose.yaml similarity index 90% rename from compose.yml rename to compose.yaml index 5a0f3c5..689443a 100644 --- a/compose.yml +++ b/compose.yaml @@ -1,6 +1,3 @@ ---- -version: "3.8" - services: app: image: dobbs/farm:1.0.18 @@ -37,7 +34,6 @@ 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" # healthcheck: # test: ["CMD", "curl", "-f", "http://localhost"] # interval: 30s @@ -55,9 +51,9 @@ networks: configs: install_sh_conf: - name: ${STACK_NAME}_install_sh_${INSTALL_SH_VERSION} + name: ${STACK_NAME}_install_sh file: install.sh config_json_conf: - name: ${STACK_NAME}_config_json_${CONFIG_JSON_VERSION} + name: ${STACK_NAME}_config_json file: config.json.tmpl template_driver: golang diff --git a/release/1.0.0+1.0.18 b/release/1.0.0+1.0.18 deleted file mode 100644 index 1d777c6..0000000 --- a/release/1.0.0+1.0.18 +++ /dev/null @@ -1,7 +0,0 @@ -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 10d66575cfd49864405cea952d97439af4c5a65e Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Mon, 16 Oct 2023 23:16:59 +0000 Subject: [PATCH 02/14] update to cc commit a7bda15182 --- compose.owner.yaml | 11 --------- compose.yaml | 49 ++++++++++++++++++++++--------------- config.initial.json.tmpl | 6 +++++ config.json.tmpl | 14 ----------- config.owner.json.tmpl | 6 ----- install.sh => entrypoint.sh | 4 --- 6 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 compose.owner.yaml 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/compose.owner.yaml b/compose.owner.yaml deleted file mode 100644 index 10ee306..0000000 --- a/compose.owner.yaml +++ /dev/null @@ -1,11 +0,0 @@ -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 - file: config.owner.json.tmpl - template_driver: golang diff --git a/compose.yaml b/compose.yaml index 689443a..c0193d0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,23 +1,26 @@ services: app: - image: dobbs/farm:1.0.18 - command: /bin/sh config/install.sh + image: dobbs/farm:1.0.20 + 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: @@ -34,26 +37,32 @@ services: - "caddy.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" - # 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 : \"/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: - fedwiki_friends: networks: proxy: external: true +secrets: + cookie_secret: + external: true + name: ${STACK_NAME}_cookie_secret + configs: - install_sh_conf: - name: ${STACK_NAME}_install_sh - file: install.sh - config_json_conf: - name: ${STACK_NAME}_config_json - file: config.json.tmpl + entrypoint_sh_conf: + name: ${STACK_NAME}_entrypoint_sh + file: entrypoint.sh + config_json_initial_conf: + name: ${STACK_NAME}_config_initial_json + 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..c6d5146 --- /dev/null +++ b/config.initial.json.tmpl @@ -0,0 +1,6 @@ +{ + "farm": true, + "cookieSecret": "{{ secret "cookie_secret" }}", + "secure_cookie": true, + "security_type": "friends" +} \ No newline at end of file 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.52.0 From d059b04de0d96360b5debe711a6211da40cde07a Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Tue, 17 Oct 2023 04:17:26 +0000 Subject: [PATCH 03/14] replace var where fixed name is. Update README. --- README.md | 40 +++++++++++++++++++--------------------- compose.yaml | 4 ++-- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 30f8cef..f89c4a2 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,24 @@ -# Federated Wiki +# Fedwiki -Share pages circulating within a creative commons +Wiki Cafe's configuration for a Nextcloud deployment. Originally slimmed down from an `abra` [recipe](https://git.coopcloud.tech/coop-cloud/federatedwiki) by [Co-op Cloud](https://coopcloud.tech/). - -* **Category**: Apps -* **Status**: 0, work-in-progress -* **Image**: [`dobbs/farm`](https://hub.docker.com/r/dobbs/farm/), 4, upstream -* **Healthcheck**: No -* **Backups**: No -* **Email**: No -* **Tests**: No -* **SSO**: No - -## Basic usage +## Deploying the app with Docker Swarm -1. Set up Docker Swarm and [`abra`] -2. Deploy [`coop-cloud/traefik`] -3. `abra app new federatedwiki` -4. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to - your Docker swarm box -5. `abra app deploy YOURAPPDOMAIN` +Set the environment variables from the .env file during the shell session. -[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra -[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik +``` +set -a && source .env && set +a +``` + +Set the secrets. + +``` +printf "SECRET_HERE" | docker secret create SECRET_NAME - +``` + +Deploy using the `-c` flag to specify one or multiple compose files. + +``` +docker stack deploy fedwiki -c compose.yaml -c compose.lib.yaml -c compose.wikicafe.yaml +``` \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index c0193d0..330f951 100644 --- a/compose.yaml +++ b/compose.yaml @@ -3,7 +3,7 @@ services: image: dobbs/farm:1.0.20 command: /bin/sh entrypoint.sh volumes: - - "${FEDWIKI_VOLUME}:/home/node/.wiki" + - "fedwiki_data:/home/node/.wiki" networks: - proxy configs: @@ -47,7 +47,7 @@ process.exit(1); }); request.end();'" start_period: 30s volumes: - fedwiki: + fedwiki_data: networks: proxy: -- 2.52.0 From a7ff392dd156f54963e20bf88706ac103c494afd Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Fri, 3 Nov 2023 21:41:51 +0000 Subject: [PATCH 04/14] rename volumes --- compose.lib.yaml | 4 ++-- compose.yaml | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/compose.lib.yaml b/compose.lib.yaml index e5a6ecb..c74a7aa 100644 --- a/compose.lib.yaml +++ b/compose.lib.yaml @@ -1,7 +1,7 @@ services: app: volumes: - - "fedwiki_lib:/home/node/lib" + - "lib:/home/node/lib" volumes: - fedwiki_lib: + lib: diff --git a/compose.yaml b/compose.yaml index 330f951..f5873ee 100644 --- a/compose.yaml +++ b/compose.yaml @@ -3,7 +3,7 @@ services: image: dobbs/farm:1.0.20 command: /bin/sh entrypoint.sh volumes: - - "fedwiki_data:/home/node/.wiki" + - "data:/home/node/.wiki" networks: - proxy configs: @@ -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" + - "traefik.http.routers.${STACK_NAME}_auth.rule=(Host(`${DOMAIN}`) && (PathPrefix(`/auth`) || Path(`/security/dialog.css`)))" + - "traefik.http.routers.${STACK_NAME}_auth.entrypoints=web-secure" + - "traefik.http.routers.${STACK_NAME}_auth.tls.certresolver=${LETS_ENCRYPT_ENV}" - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}" - "caddy.reverse_proxy={{upstreams 3000}}" - "caddy.tls.on_demand=" @@ -47,7 +50,7 @@ process.exit(1); }); request.end();'" start_period: 30s volumes: - fedwiki_data: + data: networks: proxy: -- 2.52.0 From c35e2802c7558226a319ad6a6d9e90c9b73a23fe Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Sun, 5 Nov 2023 04:40:39 +0000 Subject: [PATCH 05/14] remove wikicafe.yaml --- compose.wikicafe.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 compose.wikicafe.yaml diff --git a/compose.wikicafe.yaml b/compose.wikicafe.yaml deleted file mode 100644 index 301d72a..0000000 --- a/compose.wikicafe.yaml +++ /dev/null @@ -1,3 +0,0 @@ -services: - app: - image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest -- 2.52.0 From e2706d14ad15037dcfeef47425a520f97711c72f Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Fri, 17 Nov 2023 21:43:19 +0000 Subject: [PATCH 06/14] Revert "remove wikicafe.yaml" This reverts commit c35e2802c7558226a319ad6a6d9e90c9b73a23fe. --- compose.wikicafe.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 compose.wikicafe.yaml diff --git a/compose.wikicafe.yaml b/compose.wikicafe.yaml new file mode 100644 index 0000000..301d72a --- /dev/null +++ b/compose.wikicafe.yaml @@ -0,0 +1,3 @@ +services: + app: + image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest -- 2.52.0 From db6dc1d6f745b0bccafdc4560c76833adfedfe4f Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Tue, 5 Dec 2023 17:52:10 +0000 Subject: [PATCH 07/14] Allow specifying WIKI_VERSION --- compose.wikicafe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.wikicafe.yaml b/compose.wikicafe.yaml index 301d72a..cf62e02 100644 --- a/compose.wikicafe.yaml +++ b/compose.wikicafe.yaml @@ -1,3 +1,3 @@ services: app: - image: git.coopcloud.tech/wiki-cafe/wiki-farm:latest + image: git.coopcloud.tech/wiki-cafe/wiki-farm:${WIKI_VERSION:-latest} -- 2.52.0 From cf0375420c607d1828a630fe0afa6dbe1384c293 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Tue, 5 Dec 2023 17:52:34 +0000 Subject: [PATCH 08/14] Add EXTRA_DOMAINS --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index f5873ee..015808f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -35,7 +35,7 @@ services: - "traefik.http.routers.${STACK_NAME}_auth.rule=(Host(`${DOMAIN}`) && (PathPrefix(`/auth`) || Path(`/security/dialog.css`)))" - "traefik.http.routers.${STACK_NAME}_auth.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}_auth.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}" + - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, https://${EXTRA_DOMAIN}, https://*.${EXTRA_DOMAIN}, https://*.*.${EXTRA_DOMAIN}, https://*.*.*.${EXTRA_DOMAIN}" - "caddy.reverse_proxy={{upstreams 3000}}" - "caddy.tls.on_demand=" - "backupbot.backup=true" -- 2.52.0 From b190900922be32dde2fc27321de73f587cd8300b Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Sun, 2 Feb 2025 20:31:40 +0000 Subject: [PATCH 09/14] Update README and compose files --- README.md | 2 +- compose.yaml | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f89c4a2..189edbb 100644 --- a/README.md +++ b/README.md @@ -20,5 +20,5 @@ printf "SECRET_HERE" | docker secret create SECRET_NAME - Deploy using the `-c` flag to specify one or multiple compose files. ``` -docker stack deploy fedwiki -c compose.yaml -c compose.lib.yaml -c compose.wikicafe.yaml +docker stack deploy fedwiki --detach=true -c compose.yaml -c compose.lib.yaml -c compose.wikicafe.yaml ``` \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index 015808f..e475cff 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: app: - image: dobbs/farm:1.0.20 + image: dobbs/farm:1.0.26 command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" @@ -15,6 +15,7 @@ services: - cookie_secret environment: - DOMAIN + - DOMAINS - COOKIE_SECRET - AUTHOR - ADMIN_KEY @@ -35,15 +36,17 @@ services: - "traefik.http.routers.${STACK_NAME}_auth.rule=(Host(`${DOMAIN}`) && (PathPrefix(`/auth`) || Path(`/security/dialog.css`)))" - "traefik.http.routers.${STACK_NAME}_auth.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}_auth.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "caddy=https://${DOMAIN}, https://*.${DOMAIN}, https://*.*.${DOMAIN}, https://*.*.*.${DOMAIN}, https://${EXTRA_DOMAIN}, https://*.${EXTRA_DOMAIN}, https://*.*.${EXTRA_DOMAIN}, https://*.*.*.${EXTRA_DOMAIN}" - - "caddy.reverse_proxy={{upstreams 3000}}" - - "caddy.tls.on_demand=" + - "caddy_0=https://${DOMAIN}" + - "caddy_0.tls.on_demand=" + - "caddy_0.@match.path=/auth/* /security/dialog.css" + - "caddy_0.reverse_proxy= @match {{upstreams 3000}}" + - ${DOMAINS} + - "caddy_1.reverse_proxy={{upstreams 3000}}" + - "caddy_1.tls.on_demand=" - "backupbot.backup=true" - "backupbot.backup.path=/home/node/.wiki" 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();'" + 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 -- 2.52.0 From 13b27471e8d0151296f0da4924fce496592a5437 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Tue, 6 May 2025 16:58:56 +0000 Subject: [PATCH 10/14] Rely on decaf image instead of custom image. --- .gitignore | 2 +- compose.wikicafe.yaml | 3 --- compose.yaml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 compose.wikicafe.yaml diff --git a/.gitignore b/.gitignore index 4c49bd7..e6905a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.env +.env* \ No newline at end of file diff --git a/compose.wikicafe.yaml b/compose.wikicafe.yaml deleted file mode 100644 index cf62e02..0000000 --- a/compose.wikicafe.yaml +++ /dev/null @@ -1,3 +0,0 @@ -services: - app: - image: git.coopcloud.tech/wiki-cafe/wiki-farm:${WIKI_VERSION:-latest} diff --git a/compose.yaml b/compose.yaml index e475cff..5b614f1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: app: - image: dobbs/farm:1.0.26 + image: dobbs/farm:1.1.0 command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" -- 2.52.0 From ce35dd4e161573ba5387516ac50b964065b63c7c Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Thu, 16 Oct 2025 07:41:15 +0000 Subject: [PATCH 11/14] Wiki Cafe OCI image --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 5b614f1..e7ff87e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: app: - image: dobbs/farm:1.1.0 + image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.3-1 command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" -- 2.52.0 From 06ec22ab425ffe0df6cba96fd6c24895a503b480 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Fri, 24 Oct 2025 20:26:19 +0000 Subject: [PATCH 12/14] Update fedwiki OCI image to version 0.38.5-2 --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index e7ff87e..3a0ecc3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: app: - image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.3-1 + image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.5-2 command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" -- 2.52.0 From 280402daf796ee18079d4672c25f6a7c367cdc44 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Fri, 2 Jan 2026 02:00:27 +0000 Subject: [PATCH 13/14] Update fedwiki OCI image to version 0.38.6-2 and simplify deployment command in README --- README.md | 2 +- compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 189edbb..0e2433c 100644 --- a/README.md +++ b/README.md @@ -20,5 +20,5 @@ printf "SECRET_HERE" | docker secret create SECRET_NAME - Deploy using the `-c` flag to specify one or multiple compose files. ``` -docker stack deploy fedwiki --detach=true -c compose.yaml -c compose.lib.yaml -c compose.wikicafe.yaml +docker stack deploy fedwiki --detach=true -c compose.yaml ``` \ No newline at end of file diff --git a/compose.yaml b/compose.yaml index 3a0ecc3..5efc99b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: app: - image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.5-2 + image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.6-2 command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" -- 2.52.0 From 2a775b48edb1afe0f84706b45690821fb390a28d Mon Sep 17 00:00:00 2001 From: Robert Best Date: Sat, 11 Apr 2026 13:04:47 -0400 Subject: [PATCH 14/14] update image version and wiki config update to latest image version, and change initial config to have more appropriate security parameter. --- compose.yaml | 2 +- config.initial.json.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index 5efc99b..e76eb41 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: app: - image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.6-2 + image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.39.4-1 command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" diff --git a/config.initial.json.tmpl b/config.initial.json.tmpl index c6d5146..b10cadc 100644 --- a/config.initial.json.tmpl +++ b/config.initial.json.tmpl @@ -1,6 +1,6 @@ { "farm": true, "cookieSecret": "{{ secret "cookie_secret" }}", - "secure_cookie": true, + "security_useHttps": true, "security_type": "friends" } \ No newline at end of file -- 2.52.0