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