From 8710105f65154d19f7c65be10dd95b0e4ccab63b Mon Sep 17 00:00:00 2001 From: Ethel Morgan Date: Mon, 29 Jun 2020 23:18:00 +0100 Subject: refactor eth.services.catbus-{networkpresence,wakeonlan} --- nixos/modules/module-list.nix | 4 +- .../modules/services/catbus-actuator-wakeonlan.nix | 69 ------------------ nixos/modules/services/catbus-networkpresence.nix | 83 ++++++++++++++++++++++ .../services/catbus-observer-networkpresence.nix | 83 ---------------------- nixos/modules/services/catbus-wakeonlan.nix | 69 ++++++++++++++++++ 5 files changed, 154 insertions(+), 154 deletions(-) delete mode 100644 nixos/modules/services/catbus-actuator-wakeonlan.nix create mode 100644 nixos/modules/services/catbus-networkpresence.nix delete mode 100644 nixos/modules/services/catbus-observer-networkpresence.nix create mode 100644 nixos/modules/services/catbus-wakeonlan.nix (limited to 'nixos') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 83566f5..d3952f1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -5,10 +5,10 @@ ./overlays.nix ./programs/dwm.nix ./services/ambience.nix - ./services/catbus-actuator-wakeonlan.nix ./services/catbus-lgtv.nix - ./services/catbus-observer-networkpresence.nix + ./services/catbus-networkpresence.nix ./services/catbus-snapcast.nix + ./services/catbus-wakeonlan.nix ./services/dlnatoad.nix ./services/helix-directory-jackalope.nix ./services/helix-directory.nix diff --git a/nixos/modules/services/catbus-actuator-wakeonlan.nix b/nixos/modules/services/catbus-actuator-wakeonlan.nix deleted file mode 100644 index c78f974..0000000 --- a/nixos/modules/services/catbus-actuator-wakeonlan.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - - cfg = config.eth.services.catbus-actuator-wakeonlan; - - configJSON = pkgs.writeText "config.json" (builtins.toJSON { - mqttBroker = cfg.mqttBroker; - devices = cfg.devices; - }); - -in { - - options.eth.services.catbus-actuator-wakeonlan = { - - enable = mkEnableOption "Whether to enable the Catbus Wake-On-LAN actuator"; - - mqttBroker = mkOption { - type = types.str; - description = "URL of the MQTT broker."; - example = "tcp://broker.local:1883"; - }; - - devices = mkOption { - type = types.attrsOf (types.submodule { - options = { - mac = mkOption { - type = types.str; - description = "The device's MAC address"; - example = "aa:bb:cc:dd:ee:ff"; - }; - topic = mkOption { - type = types.str; - description = "MQTT topic for controlling the device"; - example = "home/house/speakers/power"; - }; - }; - }); - example = { TV = { mac = "aa:bb:cc:dd:ee:ff"; topic = "home/living-room/tv/power"; }; }; - description = "A set of devices and their MACs & controller topics."; - }; - }; - - - config = mkIf cfg.enable { - systemd.services.catbus-actuator-wakeonlan = { - enable = true; - description = "Power devices on using Wake-On-LAN via Catbus"; - wants = [ "network.target" ]; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = true; - - ExecStart = "${pkgs.eth.catbus-wakeonlan}/bin/catbus-actuator-wakeonlan --config-path ${configJSON}"; - - NoNewPrivileges = true; - ProtectKernelTunables = true; - ProtectControlGroups = true; - ProtectKernelModules = true; - RestrictAddressFamilies = "AF_INET AF_INET6"; - RestrictNamespaces = true; - }; - }; - }; - -} - diff --git a/nixos/modules/services/catbus-networkpresence.nix b/nixos/modules/services/catbus-networkpresence.nix new file mode 100644 index 0000000..e69550c --- /dev/null +++ b/nixos/modules/services/catbus-networkpresence.nix @@ -0,0 +1,83 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + + cfg = config.eth.services.catbus-networkpresence; + + configJSON = pkgs.writeText "config.json" (builtins.toJSON { + mqttBroker = cfg.mqttBroker; + devices = cfg.devices; + }); + +in { + + options.eth.services.catbus-networkpresence = { + + enable = mkEnableOption "Whether to enable the Catbus network-presence observer"; + + interface = mkOption { + type = types.str; + description = "interface to scan"; + default = ""; + example = "enp2s0"; + }; + + mqttBroker = mkOption { + type = types.str; + description = "URL of the MQTT broker."; + example = "tcp://broker.local:1883"; + }; + + devices = mkOption { + type = types.attrsOf (types.submodule { + options = { + mac = mkOption { + type = types.str; + description = "The device's MAC address"; + example = "aa:bb:cc:dd:ee:ff"; + }; + topic = mkOption { + type = types.str; + description = "MQTT topic for controlling the device"; + example = "home/house/speakers/power"; + }; + }; + }); + example = { TV = { mac = "aa:bb:cc:dd:ee:ff"; topic = "home/living-room/tv/power"; }; }; + description = "A set of devices and their MACs & controller topics."; + }; + }; + + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.interface != ""; + message = "must set config.eth.services.catbus-networkpresence.interface"; + } + ]; + + systemd.services.catbus-networkpresence-observer = { + enable = true; + description = "Detect devices on the network to publish to Catbus"; + wants = [ "network.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + AmbientCapabilities = "CAP_NET_RAW CAP_NET_ADMIN"; + + ExecStart = "${pkgs.eth.catbus-networkpresence}/bin/catbus-observer-networkpresence --config-path ${configJSON} --interface ${cfg.interface}"; + + NoNewPrivileges = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + RestrictNamespaces = true; + }; + }; + }; + +} + diff --git a/nixos/modules/services/catbus-observer-networkpresence.nix b/nixos/modules/services/catbus-observer-networkpresence.nix deleted file mode 100644 index da54956..0000000 --- a/nixos/modules/services/catbus-observer-networkpresence.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; - -let - - cfg = config.eth.services.catbus-observer-networkpresence; - - configJSON = pkgs.writeText "config.json" (builtins.toJSON { - mqttBroker = cfg.mqttBroker; - devices = cfg.devices; - }); - -in { - - options.eth.services.catbus-observer-networkpresence = { - - enable = mkEnableOption "Whether to enable the Catbus network-presence observer"; - - interface = mkOption { - type = types.str; - description = "interface to scan"; - default = ""; - example = "enp2s0"; - }; - - mqttBroker = mkOption { - type = types.str; - description = "URL of the MQTT broker."; - example = "tcp://broker.local:1883"; - }; - - devices = mkOption { - type = types.attrsOf (types.submodule { - options = { - mac = mkOption { - type = types.str; - description = "The device's MAC address"; - example = "aa:bb:cc:dd:ee:ff"; - }; - topic = mkOption { - type = types.str; - description = "MQTT topic for controlling the device"; - example = "home/house/speakers/power"; - }; - }; - }); - example = { TV = { mac = "aa:bb:cc:dd:ee:ff"; topic = "home/living-room/tv/power"; }; }; - description = "A set of devices and their MACs & controller topics."; - }; - }; - - - config = mkIf cfg.enable { - assertions = [ - { - assertion = cfg.interface != ""; - message = "must set config.eth.services.catbus-observer-networkpresence.interface"; - } - ]; - - systemd.services.catbus-observer-networkpresence = { - enable = true; - description = "Detect devices on the network to publish to Catbus"; - wants = [ "network.target" ]; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - DynamicUser = true; - AmbientCapabilities = "CAP_NET_RAW CAP_NET_ADMIN"; - - ExecStart = "${pkgs.eth.catbus-networkpresence}/bin/catbus-observer-networkpresence --config-path ${configJSON} --interface ${cfg.interface}"; - - NoNewPrivileges = true; - ProtectKernelTunables = true; - ProtectControlGroups = true; - ProtectKernelModules = true; - RestrictNamespaces = true; - }; - }; - }; - -} - diff --git a/nixos/modules/services/catbus-wakeonlan.nix b/nixos/modules/services/catbus-wakeonlan.nix new file mode 100644 index 0000000..0cf7edb --- /dev/null +++ b/nixos/modules/services/catbus-wakeonlan.nix @@ -0,0 +1,69 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + + cfg = config.eth.services.catbus-wakeonlan; + + configJSON = pkgs.writeText "config.json" (builtins.toJSON { + mqttBroker = cfg.mqttBroker; + devices = cfg.devices; + }); + +in { + + options.eth.services.catbus-wakeonlan = { + + enable = mkEnableOption "Whether to enable the Catbus Wake-On-LAN actuator"; + + mqttBroker = mkOption { + type = types.str; + description = "URL of the MQTT broker."; + example = "tcp://broker.local:1883"; + }; + + devices = mkOption { + type = types.attrsOf (types.submodule { + options = { + mac = mkOption { + type = types.str; + description = "The device's MAC address"; + example = "aa:bb:cc:dd:ee:ff"; + }; + topic = mkOption { + type = types.str; + description = "MQTT topic for controlling the device"; + example = "home/house/speakers/power"; + }; + }; + }); + example = { TV = { mac = "aa:bb:cc:dd:ee:ff"; topic = "home/living-room/tv/power"; }; }; + description = "A set of devices and their MACs & controller topics."; + }; + }; + + + config = mkIf cfg.enable { + systemd.services.catbus-wakeonlan-actuator = { + enable = true; + description = "Power devices on using Wake-On-LAN via Catbus"; + wants = [ "network.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + + ExecStart = "${pkgs.eth.catbus-wakeonlan}/bin/catbus-actuator-wakeonlan --config-path ${configJSON}"; + + NoNewPrivileges = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictNamespaces = true; + }; + }; + }; + +} + -- cgit v1.2.3