From df8fcec4d90b5595f4a9e5a837f47c0de0766971 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Tue, 30 Dec 2025 23:48:34 -0800 Subject: [PATCH] Make fan service restart after secrets decryption, undo temp changes --- hosts/cap-nr200p/configuration.nix | 2 -- modules/host-groups/apollo-2000.nix | 13 ++++++++++++- modules/system/ilo-management.nix | 13 ------------- 3 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 modules/system/ilo-management.nix diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix index 4300ddc..5657b6e 100644 --- a/hosts/cap-nr200p/configuration.nix +++ b/hosts/cap-nr200p/configuration.nix @@ -31,8 +31,6 @@ ../../modules/system/security.nix ../../modules/system/systemd-boot.nix - ../../modules/system/ilo-management.nix - # Application Groups ../../modules/application-groups/3d-design.nix ../../modules/application-groups/android.nix diff --git a/modules/host-groups/apollo-2000.nix b/modules/host-groups/apollo-2000.nix index f1b294c..37ceb89 100644 --- a/modules/host-groups/apollo-2000.nix +++ b/modules/host-groups/apollo-2000.nix @@ -9,7 +9,6 @@ ../../modules/system/cpu-intel.nix ../../modules/system/fonts.nix ../../modules/system/home-manager-settings.nix - ../../modules/system/ilo-management.nix ../../modules/system/internationalization.nix ../../modules/system/networking.nix ../../modules/system/nix-settings.nix @@ -23,6 +22,18 @@ time.timeZone = "America/Los_Angeles"; + sops.secrets = { + "ssh/ilouser/id_rsa" = { + sopsFile = ../../secrets/default.yaml; + path = "/root/.ssh/ilo_id_rsa"; + restartUnits = [ "hpe-silent-fans.service" ]; + }; + "ssh/ilouser/id_rsa_pub" = { + sopsFile = ../../secrets/default.yaml; + path = "/root/.ssh/ilo_id_rsa.pub"; + }; + }; + systemd = { services.hpe-ilo-keepalive = { enable = true; diff --git a/modules/system/ilo-management.nix b/modules/system/ilo-management.nix deleted file mode 100644 index a164a76..0000000 --- a/modules/system/ilo-management.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, ... }: -{ - sops.secrets = { - "ssh/ilouser/id_rsa" = { - sopsFile = ../../secrets/default.yaml; - path = "/root/.ssh/ilo_id_rsa"; - }; - "ssh/ilouser/id_rsa_pub" = { - sopsFile = ../../secrets/default.yaml; - path = "/root/.ssh/ilo_id_rsa.pub"; - }; - }; -}