diff --git a/compose.yaml b/compose.yaml index 5efc99b..9088a29 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,10 @@ services: app: - image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.38.6-2 +<<<<<<< HEAD + image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.39.4-1 +======= + image: git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:0.39.4-2 +>>>>>>> b19daf1 (Bump app image and fix healthcheck quoting) command: /bin/sh entrypoint.sh volumes: - "data:/home/node/.wiki" @@ -46,7 +50,7 @@ services: - "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 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