movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/munin: move from /var/run to /run

Browse source 
as using /var/run now emits a warning by systemd's tmpfiles.d.
As /var/run is already a symlink to /run, this can't break anything, and
data does not need to be migrated.
This commit is contained in:
Florian Jacob 2018-10-03 17:36:37 +02:00
parent 1951aea6a5
commit c54aa26a2d
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/monitoring/munin.nix
View file

@ -5,8 +5,8 @@
# TODO: support fastcgi # TODO: support fastcgi
# http://munin-monitoring.org/wiki/CgiHowto2 # 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 /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-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html
# https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum # https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum
# nginx http://munin.readthedocs.org/en/latest/example/webserver/nginx.html # nginx http://munin.readthedocs.org/en/latest/example/webserver/nginx.html
@ -22,7 +22,7 @@ let
dbdir /var/lib/munin dbdir /var/lib/munin
htmldir /var/www/munin htmldir /var/www/munin
logdir /var/log/munin logdir /var/log/munin
rundir /var/run/munin rundir /run/munin
${cronCfg.extraGlobalConfig} ${cronCfg.extraGlobalConfig}
@ -170,7 +170,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ]; path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ];
environment.MUNIN_LIBDIR = "${pkgs.munin}/lib"; environment.MUNIN_LIBDIR = "${pkgs.munin}/lib";
environment.MUNIN_PLUGSTATE = "/var/run/munin"; environment.MUNIN_PLUGSTATE = "/run/munin";
environment.MUNIN_LOGDIR = "/var/log/munin"; environment.MUNIN_LOGDIR = "/var/log/munin";
preStart = '' preStart = ''
echo "updating munin plugins..." echo "updating munin plugins..."
@ -188,7 +188,7 @@ in
}; };
# munin_stats plugin breaks as of 2.0.33 when this doesn't exist # 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 { }) (mkIf cronCfg.enable {
@ -210,7 +210,7 @@ in
}; };
systemd.tmpfiles.rules = [ 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/log/munin 0755 munin munin -"
"d /var/www/munin 0755 munin munin -" "d /var/www/munin 0755 munin munin -"
"d /var/lib/munin 0755 munin munin -" "d /var/lib/munin 0755 munin munin -"