From a4c0c2b05182f613dadbf237f6ffaa67235b8f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Numbus?= <admin@numbus.eu>
Date: Thu, 5 Mar 2026 09:24:51 +0100
Subject: [PATCH] Fixed home-assistant `400: bad request`. Fixed
 Nextcloud-Quirk failing. Fixed Nextcloud-Onlyoffice `mkdir: permission
 denied`.

---
 modules/services/home-assistant.nix | 18 +++++++++---------
 modules/services/nextcloud.nix      | 15 ++++-----------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/modules/services/home-assistant.nix b/modules/services/home-assistant.nix
index 3635dc9..2ccfe5a 100644
--- a/modules/services/home-assistant.nix
+++ b/modules/services/home-assistant.nix
@@ -83,8 +83,8 @@ helper.mkPodmanService {
   };
 
   extraConfig = {
-    systemd.services."${name}-quirk-1" = {
-      description = "Podman container quirk 1 : ${name}";
+    systemd.services."${name}-quirk" = {
+      description = "Podman container quirk : ${name}";
       wantedBy = [ "multi-user.target" ];
       after = [ "${name}.service" ];
       onFailure = [ "service-failure-notify@%n.service" ];
@@ -114,7 +114,7 @@ helper.mkPodmanService {
 
 http:
   use_x_forwarded_for: true
-  trusted_proxies: ${config.numbus.networking.ipAddress}/24
+  trusted_proxies: 10.89.0.0/16
 
 zha:
 EOF
@@ -123,11 +123,11 @@ EOF
     };
   };
 
-    systemd.services."${name}-quirk-2" = {
-      description = "Podman container quirk 2 : ${name}";
-      wantedBy = [ "multi-user.target" "${name}.service" ];
-      after = [ "${name}-secrets.service" ];
-      before = [ "${name}.service" "${name}-permissions.service" ];
+    systemd.services."mqtt-quirk" = {
+      description = "Podman container quirk : Home-assistant MQTT";
+      wantedBy = [ "multi-user.target" "mqtt.service" ];
+      after = [ "mqtt-secrets.service" ];
+      before = [ "mqtt.service" "mqtt-permissions.service" ];
       onFailure = [ "service-failure-notify@%n.service" ];
       startLimitBurst = 5;
       startLimitIntervalSec = 600;
@@ -157,7 +157,7 @@ listener 1883
 allow_anonymous false
 password_file /mosquitto/password.txt
 EOF
-        source /var/lib/numbus-server/${name}/.env
+        source /var/lib/numbus-server/mqtt/.env
         mosquitto_passwd -b ${cfg.configDir}/mqtt/password.txt "$HOME_ASSISTANT_MQTT_USER" "$HOME_ASSISTANT_MQTT_PASSWORD"
         chmod 600 ${cfg.configDir}/mqtt/password.txt
       '';
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
index 8497fa5..71c6bbf 100644
--- a/modules/services/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -38,6 +38,7 @@ helper.mkPodmanService {
     "100999:100 ${cfg.configDir}/onlyoffice"
     "100999:100 ${cfg.configDir}/onlyoffice/log"
     "100999:100 ${cfg.configDir}/onlyoffice/cache"
+    "100999:100 ${cfg.configDir}/onlyoffice/data"
     "100999:100 ${cfg.configDir}/onlyoffice/database"
     "100032:100 ${cfg.dataDir}"
   ];
@@ -135,6 +136,7 @@ helper.mkPodmanService {
         volumes:
           - ${cfg.configDir}/onlyoffice/log:/var/log/onlyoffice
           - ${cfg.configDir}/onlyoffice/cache:/var/lib/onlyoffice
+          - ${cfg.configDir}/onlyoffice/data:/var/www/onlyoffice/
           - ${cfg.configDir}/onlyoffice/database:/var/lib/postgresql
         security_opt:
           - no-new-privileges:true
@@ -203,15 +205,6 @@ helper.mkPodmanService {
                 - url: "http://host.containers.internal:3002"
     '';
 
-    environment.etc."traefik/rules/nextcloud-dav.yaml".text = ''
-      http:
-        middlewares:
-          nextcloud-dav:
-            replacePathRegex:
-              regex: "^/.well-known/ca(l|rd)dav"
-              replacement: "/remote.php/dav/"
-    '';
-
     systemd.services."${name}-quirk" = {
       description = "Podman container quirk : ${name}";
       wantedBy = [ "multi-user.target" ];
@@ -234,9 +227,9 @@ helper.mkPodmanService {
         done
         source /var/lib/numbus-server/${name}/.env
 
-        until $OCC status >/dev/null 2>&1; do
+        until $OCC status | grep -iq "installed: true" >/dev/null 2>&1; do
           echo "Waiting for Nextcloud to be up and running..."
-          sleep 10
+          sleep 60
         done
 
         $OCC db:add-missing-indices