fix icloud .env

.env.example

@@ -2,15 +2,13 @@
 # General
 # =========================
 
+# Also modify .flatnotes.env.example
+
 DOMAIN=tomasrivera.ch
 TZ=Europe/Zurich
 
 HLEDGER_PASSWORD_HASH=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-FLATNOTES_USERNAME=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-FLATNOTES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-FLATNOTES_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
 METUBE_PASSWORD_HASH=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
 TRANSMUTE_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

.flatnotes.env.example

@@ -0,0 +1,3 @@
+FLATNOTES_USERNAME=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+FLATNOTES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+FLATNOTES_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

.gitignore

@@ -1,6 +1,6 @@
 # Secrets
 .env
-
+.flatnotes.env
 # Docker data
 data/
 volumes/

bootstrap.sh

@@ -140,16 +140,25 @@ chown "$USERNAME:$USERNAME" \
 ################################################################################
 
 step "Initializing environment"
-
+if [ ! -f "/home/$USERNAME/$REPO_DIR/.flatnotes.env" ]; then
-if [ ! -f "/home/$USERNAME/$REPO_DIR/.env" ]; then
+    cp "/home/$USERNAME/$REPO_DIR/.flatnotes.env.example" \
-    cp "/home/$USERNAME/$REPO_DIR/.env.example" \
+       "/home/$USERNAME/$REPO_DIR/.flatnotes.env"
-       "/home/$USERNAME/$REPO_DIR/.env"
 
     chown "$USERNAME:$USERNAME" \
-        "/home/$USERNAME/$REPO_DIR/.env"
+        "/home/$USERNAME/$REPO_DIR/.flatnotes.env"
 
     chmod 600 \
-        "/home/$USERNAME/$REPO_DIR/.env"
+        "/home/$USERNAME/$REPO_DIR/.flatnotes.env"
+
+if [ ! -f "/home/$USERNAME/$REPO_DIR/.flatnotes.env" ]; then
+    cp "/home/$USERNAME/$REPO_DIR/.flatnotes.env.example" \
+       "/home/$USERNAME/$REPO_DIR/.flatnotes.env"
+
+    chown "$USERNAME:$USERNAME" \
+        "/home/$USERNAME/$REPO_DIR/.flatnotes.env"
+
+    chmod 600 \
+        "/home/$USERNAME/$REPO_DIR/.flatnotes.env"
 
     cat <<EOF
 

compose.yml

@@ -99,12 +99,11 @@ services:
 
     environment:
       - TZ=Europe/Zurich
-      - FLATNOTES_USERNAME=${FLATNOTES_USERNAME}
-      - FLATNOTES_PASSWORD=${FLATNOTES_PASSWORD}
-      - FLATNOTES_SECRET_KEY=${FLATNOTES_SECRET_KEY}
-
     volumes:
       - /mnt/kdrive/Notes/quicknotes:/data
+    env_file:
+      - /home/tomasr/vps-config/.flatnotes.env
+
   radicale:
     image: tomsquest/docker-radicale:latest
     container_name: radicale