From f7a930c429de8778ad99298039484572675dfbc0 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 23 Mar 2021 07:37:21 +0100 Subject: [PATCH] small changes --- configs/pepe/home-assistant.nix | 4 ++++ configs/workhorse/syncthing.nix | 2 ++ mqtt/heater.py | 10 +++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configs/pepe/home-assistant.nix b/configs/pepe/home-assistant.nix index c3ee8a3..c6146c3 100644 --- a/configs/pepe/home-assistant.nix +++ b/configs/pepe/home-assistant.nix @@ -17,6 +17,9 @@ in { ./home-assistant/zigbee2mqtt.nix ]; + networking.firewall.allowedTCPPorts = [ 8123 ]; + networking.firewall.allowedUDPPorts = [ 8123 ]; + services.homeAssistantConfig = { # turn on to edit GUI @@ -37,6 +40,7 @@ in { config.module.cluster.services.tinc."private".networkSubnet # lan network "10.1.0.0/24" + "192.168.178.0/24" ]; }]; diff --git a/configs/workhorse/syncthing.nix b/configs/workhorse/syncthing.nix index 43492ef..dcdf44e 100644 --- a/configs/workhorse/syncthing.nix +++ b/configs/workhorse/syncthing.nix @@ -115,10 +115,12 @@ system.permown."/home/syncthing" = { owner = "syncthing"; group = "syncthing"; + umask = "0022"; }; system.permown."/media/syncthing" = { owner = "syncthing"; group = "syncthing"; + umask = "0022"; }; systemd.services."permown._media_syncthing" = { bindsTo = [ "media.mount" ]; diff --git a/mqtt/heater.py b/mqtt/heater.py index 6dad885..e62219f 100644 --- a/mqtt/heater.py +++ b/mqtt/heater.py @@ -86,6 +86,7 @@ watcher = Watcher({ "office1": Heater(topic="zigbee2mqtt/office_heater_1"), "office2": Heater(topic="zigbee2mqtt/office_heater_2"), "bedroom": Heater(topic="zigbee2mqtt/bedroom_heater_1"), + "storage": Heater(topic="zigbee2mqtt/storage_heater_1"), }) @@ -127,14 +128,17 @@ def update_scene(client): watcher.update("office1", 14) watcher.update("office2", 14) watcher.update("bedroom", 14) + watcher.update("storage", 14) elif scene in ["default", "up-bright", "up-dark", "half", "down"]: - watcher.update("office1", 28) - watcher.update("office2", 28) - watcher.update("bedroom", 20) + watcher.update("office1", 25) + watcher.update("office2", 25) + watcher.update("bedroom", 18) + watcher.update("storage", 18) else: watcher.update("office1", 14) watcher.update("office2", 14) watcher.update("bedroom", 14) + watcher.update("storage", 14) watcher.publish(client)