From 7f23cf3c9d8abe25bacce2635ab6d9887a67355d Mon Sep 17 00:00:00 2001
From: 3wc <3wc@doesthisthing.work>
Date: Mon, 23 Aug 2021 00:31:41 +0200
Subject: [PATCH] Fix up variable names

---
 .env.sample      | 4 +++-
 abra.sh          | 6 +++---
 compose.yml      | 2 +-
 config.json.tmpl | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.env.sample b/.env.sample
index b4074c6..7f1e5a4 100644
--- a/.env.sample
+++ b/.env.sample
@@ -10,4 +10,6 @@ LETS_ENCRYPT_ENV=production
 
 COOKIE_SECRET="asflkjqpweoriuwpeogdjgbpdofigh"
 AUTHOR="Baja Colorado"
-PASSWORD="Please Choose a Better Password"
+ADMIN_KEY="<paste from a .wiki/DOMAIN/status/owner.json file>"
+
+FEDWIKI_IS_PRIVATE=0
diff --git a/abra.sh b/abra.sh
index 58c62ab..8059871 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,6 +1,6 @@
-export INSTALL_SH_VERSION=v7
-export CONFIG_JSON_VERSION=v6
-export CONFIG_OWNER_JSON_VERSION=v3
+export INSTALL_SH_VERSION=v8
+export CONFIG_JSON_VERSION=v7
+export CONFIG_OWNER_JSON_VERSION=v4
 
 abra_backup_app() {
   _abra_backup_dir "app:/home/node/.wiki"
diff --git a/compose.yml b/compose.yml
index 9e45371..3c88287 100644
--- a/compose.yml
+++ b/compose.yml
@@ -19,7 +19,7 @@ services:
       - DOMAIN
       - COOKIE_SECRET
       - AUTHOR
-      - PASSWORD
+      - ADMIN_KEY
     deploy:
       restart_policy:
         condition: on-failure
diff --git a/config.json.tmpl b/config.json.tmpl
index 007cd2b..01a9642 100644
--- a/config.json.tmpl
+++ b/config.json.tmpl
@@ -1,10 +1,10 @@
 {
-  "admin": "{{ env "PASSWORD" }}",
+  "admin": "{{ env "ADMIN_KEY" }}",
   "farm": true,
   "cookieSecret": "{{ env "COOKIE_SECRET" }}",
   "secure_cookie": true,
   "security_type": "friends"
-  {{ if eq (env "FEDAWIKI_IS_PRIVATE") "1" }},
+  {{ if eq (env "FEDWIKI_IS_PRIVATE") "1" }},
   "wikiDomains": {
     "$DOMAIN": {
       "id": "/home/node/.wiki/config.owner.json"