ma ham/mqtt: convert to new mosquitto configuration

1 files changed, 26 insertions, 18 deletions

diff --git a/makefu/2configs/home/ham/mqtt.nix b/makefu/2configs/home/ham/mqtt.nix
index cd1c328d..0eca1574 100644
--- a/makefu/2configs/home/ham/mqtt.nix
+++ b/makefu/2configs/home/ham/mqtt.nix
@@ -1,24 +1,32 @@
 { pkgs, config, ... }:
 {
+  environment.systemPackages = [ pkgs.mosquitto ];
+  # port open via trusted interface
   services.mosquitto = {
     enable = true;
-    host = "0.0.0.0";
-    allowAnonymous = false;
-    checkPasswords = true;
-    # see <host>/mosquitto
-    users.sensor = {
-      hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
-      acl = [ "topic readwrite #" ];
-    };
-    users.hass = {
-      hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA==";
-      acl = [ "topic readwrite #" ];
-    };
-    users.stats = {
-      hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA==";
-      acl = [ "topic read #" ];
-    };
+    persistence = false;
+    settings.max_keepalive = 60;
+    listeners = [
+      {
+        port = 1883;
+        omitPasswordAuth = true;
+        checkPasswords = true;
+        users.sensor = {
+          hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
+          acl = [ "topic readwrite #" ];
+        };
+        users.hass = {
+          hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA==";
+          acl = [ "topic readwrite #" ];
+        };
+        users.stats = {
+          hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA==";
+          acl = [ "topic read #" ];
+        };
+        settings = {
+          allow_anonymous = false;
+        };
+      }
+    ];
   };
-  environment.systemPackages = [ pkgs.mosquitto ];
-  # port open via trusted interface
 }