Fix up variable names

This commit is contained in:
3wc 2021-08-23 00:31:41 +02:00
parent 0d6fea078c
commit 7f23cf3c9d
4 changed files with 9 additions and 7 deletions

View File

@ -10,4 +10,6 @@ LETS_ENCRYPT_ENV=production
COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh" COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh"
AUTHOR="Baja Colorado" AUTHOR="Baja Colorado"
PASSWORD="Please Choose a Better Password" ADMIN_KEY="<paste from a .wiki/DOMAIN/status/owner.json file>"
FEDWIKI_IS_PRIVATE=0

View File

@ -1,6 +1,6 @@
export INSTALL_SH_VERSION=v7 export INSTALL_SH_VERSION=v8
export CONFIG_JSON_VERSION=v6 export CONFIG_JSON_VERSION=v7
export CONFIG_OWNER_JSON_VERSION=v3 export CONFIG_OWNER_JSON_VERSION=v4
abra_backup_app() { abra_backup_app() {
_abra_backup_dir "app:/home/node/.wiki" _abra_backup_dir "app:/home/node/.wiki"

View File

@ -19,7 +19,7 @@ services:
- DOMAIN - DOMAIN
- COOKIE_SECRET - COOKIE_SECRET
- AUTHOR - AUTHOR
- PASSWORD - ADMIN_KEY
deploy: deploy:
restart_policy: restart_policy:
condition: on-failure condition: on-failure

View File

@ -1,10 +1,10 @@
{ {
"admin": "{{ env "PASSWORD" }}", "admin": "{{ env "ADMIN_KEY" }}",
"farm": true, "farm": true,
"cookieSecret": "{{ env "COOKIE_SECRET" }}", "cookieSecret": "{{ env "COOKIE_SECRET" }}",
"secure_cookie": true, "secure_cookie": true,
"security_type": "friends" "security_type": "friends"
{{ if eq (env "FEDAWIKI_IS_PRIVATE") "1" }}, {{ if eq (env "FEDWIKI_IS_PRIVATE") "1" }},
"wikiDomains": { "wikiDomains": {
"$DOMAIN": { "$DOMAIN": {
"id": "/home/node/.wiki/config.owner.json" "id": "/home/node/.wiki/config.owner.json"