nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-23 17:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/ups: deduplicate environment variables

Browse Source 
No functional change, but more DRY.

(cherry picked from commit 801388a6fa)
This commit is contained in:
Bjørn Forsman
2024-09-10 21:26:42 +02:00
parent 05200c081a
commit 7ea9a39b4d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/monitoring/ups.nix
View File

@@ -8,6 +8,11 @@ let
cfg = config.power.ups;
defaultPort = 3493;
envVars = {
NUT_CONFPATH = "/etc/nut";
NUT_STATEPATH = "/var/lib/nut";
};
nutFormat = {
type = with lib.types; let
@@ -520,8 +525,7 @@ in
ExecReload = "${pkgs.nut}/sbin/upsmon -c reload";
LoadCredential = mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor;
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
environment = envVars;
};
systemd.services.upsd = let
@@ -540,8 +544,7 @@ in
ExecReload = "${pkgs.nut}/sbin/upsd -c reload";
LoadCredential = mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users;
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
environment = envVars;
restartTriggers = [
config.environment.etc."nut/upsd.conf".source
];
@@ -558,8 +561,7 @@ in
# TODO: replace 'root' by another username.
ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start";
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
environment = envVars;
restartTriggers = [
config.environment.etc."nut/ups.conf".source
];