From a5f3c92a301d3c943b559553dc7df5dbb3da00b5 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 14 Apr 2025 21:54:38 +0200 Subject: [PATCH] chore: revert "feat: test z2m" This reverts commit fcc462879eedec542dab6d2a4e1afc0c158b9b6e. --- hosts/sausebiene/default.nix | 1 - hosts/sausebiene/mosquitto.nix | 15 +-- hosts/sausebiene/zigbee2mqtt.nix | 87 ------------------ hosts/sentinel/firezone.nix | 1 - hosts/ward/default.nix | 1 - hosts/ward/guests/adguardhome.nix | 1 - .../sausebiene/mosquitto-pw-zigbee2mqtt.age | 9 -- ...1c7dcb58bbdfc-mosquitto-pw-zigbee2mqtt.age | Bin 396 -> 0 bytes 8 files changed, 4 insertions(+), 111 deletions(-) delete mode 100644 hosts/sausebiene/zigbee2mqtt.nix delete mode 100644 secrets/generated/sausebiene/mosquitto-pw-zigbee2mqtt.age delete mode 100644 secrets/rekeyed/sausebiene/bf9d6a3cda28060387b1c7dcb58bbdfc-mosquitto-pw-zigbee2mqtt.age diff --git a/hosts/sausebiene/default.nix b/hosts/sausebiene/default.nix index a983702..706cea6 100644 --- a/hosts/sausebiene/default.nix +++ b/hosts/sausebiene/default.nix @@ -25,7 +25,6 @@ ./influxdb.nix ./mosquitto.nix ./wyoming.nix - ./zigbee2mqtt.nix ]; topology.self.hardware.info = "Intel N100, 16GB RAM"; diff --git a/hosts/sausebiene/mosquitto.nix b/hosts/sausebiene/mosquitto.nix index d308131..7368466 100644 --- a/hosts/sausebiene/mosquitto.nix +++ b/hosts/sausebiene/mosquitto.nix @@ -1,12 +1,5 @@ { config, ... }: { - age.secrets.mosquitto-pw-zigbee2mqtt = { - mode = "440"; - owner = "zigbee2mqtt"; - group = "mosquitto"; - generator.script = "alnum"; - }; - age.secrets.mosquitto-pw-home-assistant = { mode = "440"; owner = "hass"; @@ -21,10 +14,10 @@ { acl = [ "pattern readwrite #" ]; users = { - zigbee2mqtt = { - passwordFile = config.age.secrets.mosquitto-pw-zigbee2mqtt.path; - acl = [ "readwrite #" ]; - }; + # zigbee2mqtt = { + # passwordFile = config.age.secrets.mosquitto-pw-zigbee2mqtt.path; + # acl = [ "readwrite #" ]; + # }; home_assistant = { passwordFile = config.age.secrets.mosquitto-pw-home-assistant.path; acl = [ "readwrite #" ]; diff --git a/hosts/sausebiene/zigbee2mqtt.nix b/hosts/sausebiene/zigbee2mqtt.nix deleted file mode 100644 index ec74468..0000000 --- a/hosts/sausebiene/zigbee2mqtt.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - config, - globals, - lib, - pkgs, - ... -}: -let - zigbee2mqttDomain = "zigbee.${globals.domains.personal}"; -in -{ - wireguard.proxy-home.firewallRuleForNode.ward-web-proxy.allowedTCPPorts = [ - config.services.zigbee2mqtt.settings.frontend.port - ]; - - globals.services.zigbee2mqtt.domain = zigbee2mqttDomain; - # globals.monitoring.http.homeassistant = { - # url = "https://${homeasisstantDomain}"; - # expectedBodyRegex = "homeassistant"; - # network = "internet"; - # }; - - services.zigbee2mqtt = { - enable = true; - package = pkgs.zigbee2mqtt_2; - settings = { - advanced = { - log_level = "info"; - channel = 25; - }; - homeassistant = true; - permit_join = false; - serial = { - port = "/dev/serial/by-path/pci-0000:00:14.0-usb-0:5.4:1.0-port0"; - adapter = "zstack"; - }; - mqtt = { - server = "mqtt://localhost:1883"; - user = "zigbee2mqtt"; - password = "!/run/zigbee2mqtt/secrets.yaml mosquitto-pw"; - }; - frontend.port = 8072; - }; - }; - - systemd.services.zigbee2mqtt = { - serviceConfig = { - RuntimeDirectory = "zigbee2mqtt"; - LoadCredential = [ - "mosquitto-pw-zigbee2mqtt:${config.age.secrets.mosquitto-pw-zigbee2mqtt.path}" - ]; - }; - preStart = lib.mkBefore '' - # Update mosquitto password - # We don't use -i because it would require chown with is a @privileged syscall - MOSQUITTO_PW="$(cat "$CREDENTIALS_DIRECTORY/mosquitto-pw-zigbee2mqtt")" \ - ${lib.getExe pkgs.yq-go} '.mosquitto-pw = strenv(MOSQUITTO_PW)' \ - /dev/null > /run/zigbee2mqtt/secrets.yaml - ''; - }; - - nodes.ward-web-proxy = { - services.nginx = { - upstreams."zigbee2mqtt" = { - servers."${config.wireguard.proxy-home.ipv4}:${toString config.services.zigbee2mqtt.settings.frontend.port}" = - { }; - extraConfig = '' - zone zigbee2mqtt 64k; - keepalive 2; - ''; - }; - virtualHosts.${zigbee2mqttDomain} = { - forceSSL = true; - useACMEWildcardHost = true; - locations."/" = { - proxyPass = "http://zigbee2mqtt"; - proxyWebsockets = true; - }; - extraConfig = '' - allow ${globals.net.home-lan.vlans.home.cidrv4}; - allow ${globals.net.home-lan.vlans.home.cidrv6}; - deny all; - ''; - }; - }; - }; -} diff --git a/hosts/sentinel/firezone.nix b/hosts/sentinel/firezone.nix index e83e378..f55cdf7 100644 --- a/hosts/sentinel/firezone.nix +++ b/hosts/sentinel/firezone.nix @@ -19,7 +19,6 @@ let globals.services.paperless.domain globals.services.esphome.domain globals.services.home-assistant.domain - globals.services.zigbee2mqtt.domain "fritzbox.${globals.domains.personal}" ]; diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix index 0084a07..a56b215 100644 --- a/hosts/ward/default.nix +++ b/hosts/ward/default.nix @@ -20,7 +20,6 @@ let globals.services.paperless.domain globals.services.esphome.domain globals.services.home-assistant.domain - globals.services.zigbee2mqtt.domain "fritzbox.${globals.domains.personal}" ]; in diff --git a/hosts/ward/guests/adguardhome.nix b/hosts/ward/guests/adguardhome.nix index 4de9b06..8952bbf 100644 --- a/hosts/ward/guests/adguardhome.nix +++ b/hosts/ward/guests/adguardhome.nix @@ -119,7 +119,6 @@ in globals.services.paperless.domain globals.services.esphome.domain globals.services.home-assistant.domain - globals.services.zigbee2mqtt.domain "fritzbox.${globals.domains.personal}" ]; filters = [ diff --git a/secrets/generated/sausebiene/mosquitto-pw-zigbee2mqtt.age b/secrets/generated/sausebiene/mosquitto-pw-zigbee2mqtt.age deleted file mode 100644 index 3bb5747..0000000 --- a/secrets/generated/sausebiene/mosquitto-pw-zigbee2mqtt.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> X25519 U/Thn4wTLTDEF+mcWV5ZC8NZ5qBIwKQxxnoZOugHiDg -gF+2ZwYjT1cGIS7Q6T/c+bZdrIKpGiEQMi27qG0bYsA --> piv-p256 xqSe8Q ArPNbPO60gHXtHNndhWIibqoJ/3W5JFr/GWc3iZ0Gvp+ -7iYbOcHduUzt2f8PAW433RLqLNpH1EDzlBDy+8ez0+M --> iF51-grease |M2 voKb|f $({}coDX R2eT -9Us2yS3sDz89PGI3Sy3jvSv6+0Unpy76BeuhfyYEJcwHRGeqZHuiSDEkZyOT ---- Z2X0Rk9vCYMgzTsnYqPpgc28AQH60qbYHm2PTAHx9So -ЎƖzw(":v:sÞBo bA.I N5OT%|Z¾([ \ No newline at end of file diff --git a/secrets/rekeyed/sausebiene/bf9d6a3cda28060387b1c7dcb58bbdfc-mosquitto-pw-zigbee2mqtt.age b/secrets/rekeyed/sausebiene/bf9d6a3cda28060387b1c7dcb58bbdfc-mosquitto-pw-zigbee2mqtt.age deleted file mode 100644 index f9df97dc0d8109a4b1e3bafe22f6a1fa50af7a9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxLgXJsvAZewzJaCB*JZZ2S%cM6`dC;&(`DQ5tMptM@ST*+iO7D%YODII_5$xAG`hVmDz2~m8=`QJzr q9@utTFT3il9A)ZHmFcHnw>gQjBl5LslhF-wQJ^|^BK(Z@u-}8$@r~>N