From 46558b31a0c3205c5da0d6e5286b3c27715fe53e Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Mon, 2 Nov 2009 12:13:09 +0000
Subject: [PATCH] Added ejabberd to the systemPackages and fixed some command
 line arguments. This will make the ejabberd service working again

svn path=/nixos/trunk/; revision=18070
---
 modules/services/networking/ejabberd.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 7b341bc8604..4dce0926364 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -49,6 +49,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.ejabberd ];
 
     jobs.ejabberd =
       { description = "EJabberd server";
@@ -65,12 +66,16 @@ in
             then
                 cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
             fi
-
-            mkdir -p ${cfg.confDir}
-            test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+            
+            if ! test -d ${cfg.confDir}
+	    then
+		mkdir -p ${cfg.confDir}
+	        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
           '';
 
-        exec = "${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin:${pkgs.coreutils}/bin:${pkgs.bash}/bin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'";
+        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 =
           ''