diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-12-25 14:19:43 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-12-25 15:43:51 +0100 |
| commit | 0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0 (patch) | |
| tree | f4a296b6f496cf93b1756e40538329b85ceef226 /nixos/modules/services/monitoring/munin.nix | |
| parent | 0fbc5ddadb47c704ce4e41792ce4d61d8ee1c9af (diff) | |
| download | nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.tar nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.tar.gz nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.tar.bz2 nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.tar.lz nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.tar.xz nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.tar.zst nixpkgs-0a8623d6a9dcf6aecaab7adf8ae437bc0cdbd9e0.zip | |
nixos/munin: add /var/setuid-wrappers to PATH
/var/setuid-wrappers is an extension of the system profile, so it belongs in PATH for the munin service.
Diffstat (limited to 'nixos/modules/services/monitoring/munin.nix')
| -rw-r--r-- | nixos/modules/services/monitoring/munin.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index aab1c4b75ef..8558c4ff8e4 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/current-system/sw/bin:/run/current-system/sw/sbin" \ + --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -194,7 +194,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/run/current-system/sw/bin:/run/current-system/sw/sbin" ${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="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${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/"; |