Bunch of bugfixes. Made quirk and permissions fixing scripts more reliable.

modules/services/home-assistant.nix

@@ -23,8 +23,8 @@ helper.mkPodmanService {
     HOME_ASSISTANT_MQTT_PASSWORD = "xkcdpass -n 8 -d -";
   };
   dirPermissions = [
-    "numbus-admin:users ${cfg.configDir}/home-assistant"
-    "100999:users ${cfg.configDir}/mqtt"
+    "1000:100 ${cfg.configDir}/config"
+    "100999:100 ${cfg.configDir}/mqtt"
   ];
 
 # Compose file good
@@ -39,7 +39,7 @@ helper.mkPodmanService {
         ports:
           - "${cfg.port}:8123/tcp"
         volumes:
-          - ${cfg.configDir}/home-assistant:/config
+          - ${cfg.configDir}/config:/config
           - /etc/localtime:/etc/localtime:ro
           - /run/dbus:/run/dbus:ro
 ${lib.optionalString (cfg.devices != []) ''
@@ -95,13 +95,20 @@ ${lib.concatStringsSep "\n" (map (d: "        - \"${d}\"") cfg.devices)}
       };
       script = ''
         mkdir -p /var/lib/numbus-server/${name}
-        if [[ -e /var/lib/numbus-server/${name}/quirk-1.true ]]; then
-          exit 0
+        if [[ -e ${cfg.configDir}/config/configuration.yaml ]]; then
+          if grep -qF "${config.numbus.networking.ipAddress}/24" ${cfg.configDir}/config/configuration.yaml; then
+            exit 0
+          elif grep -qF "use_x_forwarded_for" ${cfg.configDir}/config/configuration.yaml && ! grep -qF "${config.numbus.networking.ipAddress}/24" ${cfg.configDir}/config/configuration.yaml
+            tmp=$(mktemp)
+            head -n -4 ${cfg.configDir}/config/configuration.yaml > "$tmp"
+            mv "$tmp" ${cfg.configDir}/config/configuration.yaml
+          fi
         fi
-        until [[ -e ${cfg.configDir}/home-assistant/configuration.yaml ]]; do
+
+        until [[ -e ${cfg.configDir}/config/configuration.yaml ]]; do
           sleep 15
         done
-        cat << 'EOF' >> ${cfg.configDir}/home-assistant/configuration.yaml
+        cat << 'EOF' >> ${cfg.configDir}/config/configuration.yaml
 
 http:
   use_x_forwarded_for: true
@@ -110,7 +117,6 @@ http:
 zha:
 EOF
         systemctl restart ${name}.service
-        touch /var/lib/numbus-server/${name}/quirk-1.true
       '';
     };
   };
@@ -129,10 +135,17 @@ EOF
         RemainAfterExit = true;
       };
       script = ''
-        mkdir -p /var/lib/numbus-server/${name}
-        if [[ -e /var/lib/numbus-server/${name}/quirk-2.true ]]; then
-          exit 0
+        if [[ -e ${cfg.configDir}/mqtt/mosquitto.conf && ${cfg.configDir}/mqtt/password.txt ]]; then
+          if grep -qF "listener 1883" ${cfg.configDir}/mqtt/mosquitto.conf; then
+            exit 0
+          else
+            rm ${cfg.configDir}/mqtt/mosquitto.conf
+            rm ${cfg.configDir}/mqtt/password.txt
+            touch ${cfg.configDir}/mqtt/mosquitto.conf
+            touch ${cfg.configDir}/mqtt/password.txt
+          fi
         fi
+
         cat << EOF >> ${cfg.configDir}/mqtt/mosquitto.conf
 persistence true
 persistence_location /mosquitto/data/
@@ -145,7 +158,6 @@ EOF
         source /var/lib/numbus-server/${name}/.env
         mosquitto_passwd -b ${cfg.configDir}/mqtt/password.txt "$HOME_ASSISTANT_MQTT_USER" "$HOME_ASSISTANT_MQTT_PASSWORD"
         chmod 600 ${cfg.configDir}/mqtt/password.txt
-        touch /var/lib/numbus-server/${name}/quirk-2.true
       '';
     };
 }