wiki-cafe/federatedwiki
0
0
Fork 0
forked from coop-cloud/federatedwiki
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Update README and compose files

Browse Source
This commit is contained in:
Christian Galo 2025-02-02 20:31:40 +00:00
parent cf0375420c
commit b190900922
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -20,5 +20,5 @@ printf "SECRET_HERE" | docker secret create SECRET_NAME -
Deploy using the `-c` flag to specify one or multiple compose files. 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
``` ```

17
compose.yaml
View File

@ -1,6 +1,6 @@
services: services:
app: app:
image: dobbs/farm:1.0.20 image: dobbs/farm:1.0.26
command: /bin/sh entrypoint.sh command: /bin/sh entrypoint.sh
volumes: volumes:
- "data:/home/node/.wiki" - "data:/home/node/.wiki"
@ -15,6 +15,7 @@ services:
- cookie_secret - cookie_secret
environment: environment:
- DOMAIN - DOMAIN
- DOMAINS
- COOKIE_SECRET - COOKIE_SECRET
- AUTHOR - AUTHOR
- ADMIN_KEY - 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.rule=(Host(`${DOMAIN}`) && (PathPrefix(`/auth`) || Path(`/security/dialog.css`)))"
- "traefik.http.routers.${STACK_NAME}_auth.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}_auth.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}_auth.tls.certresolver=${LETS_ENCRYPT_ENV}" - "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_0=https://${DOMAIN}"
- "caddy.reverse_proxy={{upstreams 3000}}" - "caddy_0.tls.on_demand="
- "caddy.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=true"
- "backupbot.backup.path=/home/node/.wiki" - "backupbot.backup.path=/home/node/.wiki"
healthcheck: 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) 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();'"
=> { 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 interval: 10s
timeout: 2s timeout: 2s
retries: 2 retries: 2