diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-10-21 10:07:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 10:07:25 +0200 |
| commit | cb9237d16f3ba20d9a266cacd07fd67889b07358 (patch) | |
| tree | 89ec43ff07614e08823ae71145c5407ff294fc64 /nixos | |
| parent | 3491dd06a186db0b208d23d07c1d16c9b51d895c (diff) | |
| parent | c54aa26a2da61f3027e6d664f8993b9ac1d8dc6f (diff) | |
| download | nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.tar nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.tar.gz nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.tar.bz2 nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.tar.lz nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.tar.xz nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.tar.zst nixpkgs-cb9237d16f3ba20d9a266cacd07fd67889b07358.zip | |
Merge pull request #47775 from florianjacob/munin-var-run-to-run
nixos/munin: move from /var/run to /run
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/munin.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index ff9604c7dbc..2b265d5b5a9 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -5,8 +5,8 @@ # TODO: support fastcgi # http://munin-monitoring.org/wiki/CgiHowto2 -# spawn-fcgi -s /var/run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph -# spawn-fcgi -s /var/run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html +# spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph +# spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum # nginx http://munin.readthedocs.org/en/latest/example/webserver/nginx.html @@ -22,7 +22,7 @@ let dbdir /var/lib/munin htmldir /var/www/munin logdir /var/log/munin - rundir /var/run/munin + rundir /run/munin ${cronCfg.extraGlobalConfig} @@ -170,7 +170,7 @@ in wantedBy = [ "multi-user.target" ]; path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ]; environment.MUNIN_LIBDIR = "${pkgs.munin}/lib"; - environment.MUNIN_PLUGSTATE = "/var/run/munin"; + environment.MUNIN_PLUGSTATE = "/run/munin"; environment.MUNIN_LOGDIR = "/var/log/munin"; preStart = '' echo "updating munin plugins..." @@ -188,7 +188,7 @@ in }; # munin_stats plugin breaks as of 2.0.33 when this doesn't exist - systemd.tmpfiles.rules = [ "d /var/run/munin 0755 munin munin -" ]; + systemd.tmpfiles.rules = [ "d /run/munin 0755 munin munin -" ]; }) (mkIf cronCfg.enable { @@ -210,7 +210,7 @@ in }; systemd.tmpfiles.rules = [ - "d /var/run/munin 0755 munin munin -" + "d /run/munin 0755 munin munin -" "d /var/log/munin 0755 munin munin -" "d /var/www/munin 0755 munin munin -" "d /var/lib/munin 0755 munin munin -" |