forked from coop-cloud/federatedwiki
Tidy up, add healthcheck
This commit is contained in:
parent
2da198b21b
commit
3a0d30da6a
11
.env.sample
11
.env.sample
|
@ -13,14 +13,9 @@ FEDWIKI_VOLUME="fedwiki"
|
||||||
# custom wiki.cafe image, for working oauth2 support
|
# custom wiki.cafe image, for working oauth2 support
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.wikicafe.yml"
|
#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
|
# persistent lib volume / node_modules directory, e.g. for plugmatic
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.lib.yml"
|
||||||
|
|
||||||
COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh"
|
# Note(3wc): If you change this after initial deployment, you will need to
|
||||||
AUTHOR="Baja Colorado"
|
# manually copy the new value from `conf/config.initial.json`
|
||||||
ADMIN_KEY="<paste from a .wiki/DOMAIN/status/owner.json file>"
|
SECRET_COOKIE_SECRET_VERSION=v1 # length=30
|
||||||
|
|
||||||
FEDWIKI_IS_PRIVATE=0
|
|
||||||
|
|
25
abra.sh
25
abra.sh
|
@ -1,23 +1,2 @@
|
||||||
export INSTALL_SH_VERSION=v9
|
export ENTRYPOINT_SH_VERSION=v1
|
||||||
export CONFIG_JSON_VERSION=v7
|
export CONFIG_INITIAL_JSON_VERSION=v1
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
|
@ -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
|
|
47
compose.yml
47
compose.yml
|
@ -4,23 +4,26 @@ version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: dobbs/farm:1.0.19
|
image: dobbs/farm:1.0.19
|
||||||
command: /bin/sh config/install.sh
|
command: /bin/sh entrypoint.sh
|
||||||
volumes:
|
volumes:
|
||||||
- "fedwiki_friends:/home/node/config"
|
|
||||||
- "${FEDWIKI_VOLUME}:/home/node/.wiki"
|
- "${FEDWIKI_VOLUME}:/home/node/.wiki"
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
configs:
|
configs:
|
||||||
- source: install_sh_conf
|
- source: entrypoint_sh_conf
|
||||||
target: /home/node/config/install.sh
|
target: /home/node/entrypoint.sh
|
||||||
- source: config_json_conf
|
- source: config_json_initial_conf
|
||||||
target: /home/node/config/config.json
|
target: /home/node/initial-config/config.json
|
||||||
|
secrets:
|
||||||
|
- cookie_secret
|
||||||
environment:
|
environment:
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
- COOKIE_SECRET
|
- COOKIE_SECRET
|
||||||
- AUTHOR
|
- AUTHOR
|
||||||
- ADMIN_KEY
|
- ADMIN_KEY
|
||||||
deploy:
|
deploy:
|
||||||
|
update_config:
|
||||||
|
order: start-first
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
labels:
|
labels:
|
||||||
|
@ -38,26 +41,32 @@ services:
|
||||||
- "backupbot.backup=true"
|
- "backupbot.backup=true"
|
||||||
- "backupbot.backup.path=/home/node/.wiki"
|
- "backupbot.backup.path=/home/node/.wiki"
|
||||||
- "coop-cloud.${STACK_NAME}.version=1.0.2+1.0.19"
|
- "coop-cloud.${STACK_NAME}.version=1.0.2+1.0.19"
|
||||||
# healthcheck:
|
healthcheck:
|
||||||
# test: ["CMD", "curl", "-f", "http://localhost"]
|
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)
|
||||||
# interval: 30s
|
=> { console.log(`STATUS: $${res.statusCode}`); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } }); request.on(\"error\", function(err) { console.log('ERROR');
|
||||||
# timeout: 10s
|
process.exit(1); }); request.end();'"
|
||||||
# retries: 10
|
interval: 10s
|
||||||
# start_period: 1m
|
timeout: 2s
|
||||||
|
retries: 2
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
fedwiki:
|
fedwiki:
|
||||||
fedwiki_friends:
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
|
||||||
|
secrets:
|
||||||
|
cookie_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_cookie_secret_${SECRET_COOKIE_SECRET_VERSION}
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
install_sh_conf:
|
entrypoint_sh_conf:
|
||||||
name: ${STACK_NAME}_install_sh_${INSTALL_SH_VERSION}
|
name: ${STACK_NAME}_entrypoint_sh_${ENTRYPOINT_SH_VERSION}
|
||||||
file: install.sh
|
file: entrypoint.sh
|
||||||
config_json_conf:
|
config_json_initial_conf:
|
||||||
name: ${STACK_NAME}_config_json_${CONFIG_JSON_VERSION}
|
name: ${STACK_NAME}_config_initial_json_${CONFIG_INITIAL_JSON_VERSION}
|
||||||
file: config.json.tmpl
|
file: config.initial.json.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"farm": true,
|
||||||
|
"cookieSecret": "{{ secret "cookie_secret" }}",
|
||||||
|
"secure_cookie": true,
|
||||||
|
"security_type": "friends"
|
||||||
|
}
|
|
@ -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 }}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"name": "{{ env "AUTHOR" }}",
|
|
||||||
"friend": {
|
|
||||||
"secret": "{{ env "PASSWORD" }}"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,8 +4,4 @@ if [ ! -f .wiki/config.json ]; then
|
||||||
cp config/config.json .wiki/config.json
|
cp config/config.json .wiki/config.json
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f .wiki/config.owner.json ]; then
|
|
||||||
cp config/config.owner.json .wiki/config.owner.json
|
|
||||||
fi
|
|
||||||
|
|
||||||
wiki --farm
|
wiki --farm
|
Loading…
Reference in New Issue