From a5cdfcbdb2da9f4ecac892a1a91ebe1d02c8ac11 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu, 19 Nov 2009 13:15:15 +0000
Subject: [PATCH] Removed the dirty sleep hack from the ejabberd service

svn path=/nixos/branches/upstart-0.6/; revision=18456
---
 modules/services/networking/ejabberd.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index ae8cf47b2fa..14476d3e337 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -56,6 +56,10 @@ in
 
         startOn = "started network-interface";
         stopOn = "stopping network-interfaces";
+	
+	environment = {
+	  PATH = "$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
+	};
 
         preStart =
           ''
@@ -73,13 +77,13 @@ in
 	        cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
 	        sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
 	    fi
+	    
+	    ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
           '';
 
-        exec = "${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start; sleep 1d'";
-
         postStop =
           ''        
-            ${pkgs.ejabberd}/sbin/ejabberdctl stop
+            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} stop
           '';
       };