diff options
author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 04:11:01 -0600 |
---|---|---|
committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 04:11:01 -0600 |
commit | 4aa0923009dac4d2307b5fe018b944180bfad6a2 (patch) | |
tree | f3a9ae5ddb0d772936dd1d53534fbe677e67a838 /nixos/modules/services/monitoring | |
parent | a8cb2afa981099889cf47185be33f4a831ff482b (diff) | |
download | nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.gz nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.bz2 nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.lz nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.xz nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.tar.zst nixlib-4aa0923009dac4d2307b5fe018b944180bfad6a2.zip |
Getting rid of the var indirection and using a bin path instead
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r-- | nixos/modules/services/monitoring/munin.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/smartd.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index cd4a5125029f..6d2ce5383687 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -34,7 +34,7 @@ let cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) wrapProgram $file \ - --set PATH "/run/wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \ + --set PATH "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -183,7 +183,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/run/wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash + PATH="/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index af02d73597fe..4d10299a9879 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -124,7 +124,7 @@ in }; mailer = mkOption { - default = "/run/wrappers/sendmail"; + default = "/run/wrappers/bin/sendmail"; type = types.path; description = '' Sendmail-compatible binary to be used to send the messages. |