From 444087032be23c51ffaecba43b9bd02155e38842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Fri, 14 Aug 2026 12:34:03 +0200
Subject: [PATCH] fix icloud .env

---
 .env.example           |  6 ++----
 .flatnotes.env.example |  3 +++
 .gitignore             |  2 +-
 bootstrap.sh           | 21 +++++++++++++++------
 compose.yml            |  7 +++----
 5 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 .flatnotes.env.example

diff --git a/.env.example b/.env.example
index 37ad0f1..c01a2d1 100644
--- a/.env.example
+++ b/.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
diff --git a/.flatnotes.env.example b/.flatnotes.env.example
new file mode 100644
index 0000000..39ca248
--- /dev/null
+++ b/.flatnotes.env.example
@@ -0,0 +1,3 @@
+FLATNOTES_USERNAME=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+FLATNOTES_PASSWORD=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+FLATNOTES_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/.gitignore b/.gitignore
index be1c21c..baedc47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Secrets
 .env
-
+.flatnotes.env
 # Docker data
 data/
 volumes/
diff --git a/bootstrap.sh b/bootstrap.sh
index b94b463..0ac8884 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -140,16 +140,25 @@ chown "$USERNAME:$USERNAME" \
 ################################################################################
 
 step "Initializing environment"
-
-if [ ! -f "/home/$USERNAME/$REPO_DIR/.env" ]; then
-    cp "/home/$USERNAME/$REPO_DIR/.env.example" \
-       "/home/$USERNAME/$REPO_DIR/.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/.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
 
diff --git a/compose.yml b/compose.yml
index 0774ca9..9d10059 100644
--- a/compose.yml
+++ b/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