Author: eelco
Date: Mon Mar 19 19:43:31 2012
New Revision: 33278
URL: https://nixos.org/websvn/nix/?rev=33278&sc=1
Log:
* Zabbix: use the path attribute.
Modified:
nixos/trunk/modules/services/monitoring/zabbix-agent.nix
nixos/trunk/modules/services/monitoring/zabbix-server.nix
Modified: nixos/trunk/modules/services/monitoring/zabbix-agent.nix
==============================================================================
--- nixos/trunk/modules/services/monitoring/zabbix-agent.nix Mon Mar 19
19:34:34 2012 (r33277)
+++ nixos/trunk/modules/services/monitoring/zabbix-agent.nix Mon Mar 19
19:43:31 2012 (r33278)
@@ -81,6 +81,8 @@
startOn = "ip-up";
stopOn = "stopping network-interfaces";
+ path = [ pkgs.zabbix.agent ];
+
preStart =
''
mkdir -m 0755 -p ${stateDir} ${logDir}
@@ -100,7 +102,7 @@
mkfifo ${stateDir}/dummy2
cat ${stateDir}/dummy2 &
pid=$!
- ${pkgs.zabbix.agent}/sbin/zabbix_agentd --config ${configFile}
100>${stateDir}/dummy2
+ zabbix_agentd --config ${configFile} 100>${stateDir}/dummy2
wait "$pid"
'';
Modified: nixos/trunk/modules/services/monitoring/zabbix-server.nix
==============================================================================
--- nixos/trunk/modules/services/monitoring/zabbix-server.nix Mon Mar 19
19:34:34 2012 (r33277)
+++ nixos/trunk/modules/services/monitoring/zabbix-server.nix Mon Mar 19
19:43:31 2012 (r33278)
@@ -95,7 +95,7 @@
fi
'';
- path = [ pkgs.nettools ];
+ path = [ pkgs.nettools pkgs.zabbix.server ];
# Zabbix doesn't have an option not to daemonize, and doesn't
# daemonize in a way that allows Upstart to track it. So to
@@ -109,7 +109,7 @@
mkfifo ${stateDir}/dummy
cat ${stateDir}/dummy &
pid=$!
- ${pkgs.zabbix.server}/sbin/zabbix_server --config ${configFile}
100>${stateDir}/dummy
+ zabbix_server --config ${configFile} 100>${stateDir}/dummy
wait "$pid"
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
