* Zabbix: use the path attribute.

svn path=/nixos/trunk/; revision=33278

modules/services/monitoring/zabbix-agent.nix

@@ -81,6 +81,8 @@ in
         startOn = "ip-up";
         stopOn = "stopping network-interfaces";
 
+        path = [ pkgs.zabbix.agent ];
+
         preStart =
           ''
             mkdir -m 0755 -p ${stateDir} ${logDir}
@@ -100,7 +102,7 @@ in
             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"
           '';
 

modules/services/monitoring/zabbix-server.nix

@@ -95,7 +95,7 @@ in
             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 @@ in
             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"
           '';