Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd ... Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix		2012-07-16 17:27:11 -04:00
..
nagios	To ease migration to systemd, generate units from the ‘jobs’ option	2012-06-16 00:19:43 -04:00
monit.nix
smartd.nix
systemhealth.nix	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
ups.nix
zabbix-agent.nix
zabbix-server.nix