From 5220822812cdc0f98b0df3beb8f1352e01915b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <admin@numbus.eu>
Date: Thu, 26 Feb 2026 19:45:36 +0100
Subject: [PATCH] Bunch of bugfixes. Made quirk and permissions fixing scripts
 more reliable.

---
 modules/services/lib.nix       |  1 -
 modules/services/nextcloud.nix | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/services/lib.nix b/modules/services/lib.nix
index 2c8ff1f..328c22c 100644
--- a/modules/services/lib.nix
+++ b/modules/services/lib.nix
@@ -136,7 +136,6 @@ ${concatStringsSep "\n" (map (m: "                  - ${m}") middlewares)}
             RestartSec = "5m";
           };
           script = ''
-            mkdir -p /var/lib/numbus-server/${name}
             ${concatStringsSep "\n" (map (perm: ''
               set -- ${perm}
               WANTED_PERMISSIONS=$1
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
index 22d0553..3e42c1d 100644
--- a/modules/services/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -210,9 +210,13 @@ helper.mkPodmanService {
       };
       script = ''
         mkdir -p /var/lib/numbus-server/${name}
-        if [[ -e /var/lib/numbus-server/${name}/quirk.true ]]; then
-          exit 0
-        fi
+        [[ -e /var/lib/numbus-server/${name}/quirk.true ]] && exit 0
+        [[ ! -e /var/lib/numbus-server/${name}/.env ]] && systemctl start ${name}-secrets.service
+        until [[ -e /var/lib/numbus-server/${name}/.env ]]; do
+          echo "Waiting for secrets generation..."
+          sleep 15
+        done
+
         source /var/lib/numbus-server/${name}/.env
         sleep 300
         sudo -u numbus-admin podman exec --user www-data nextcloud-server php occ background:cron