From 49bd768f99b4eab14a95df15821287051b73f2c3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Apr 2009 09:35:03 +0000
Subject: [PATCH] As we do not really generate ejabbred.cfg, allow at least
 overwriting it manually

svn path=/nixos/trunk/; revision=15006
---
 etc/default.nix           | 1 +
 etc/pam.d/ejabberd        | 4 ++++
 upstart-jobs/ejabberd.nix | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 etc/pam.d/ejabberd

diff --git a/etc/default.nix b/etc/default.nix
index 656e197eca5f..cf4085ba236d 100644
--- a/etc/default.nix
+++ b/etc/default.nix
@@ -259,6 +259,7 @@ import ../helpers/make-etc.nix {
       "kde"
       "cups"
       "ftp"
+      "ejabberd"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ]
diff --git a/etc/pam.d/ejabberd b/etc/pam.d/ejabberd
new file mode 100644
index 000000000000..50f3cc5ce607
--- /dev/null
+++ b/etc/pam.d/ejabberd
@@ -0,0 +1,4 @@
+auth     include        common
+account  include        common
+password include        common
+session  include        common
diff --git a/upstart-jobs/ejabberd.nix b/upstart-jobs/ejabberd.nix
index d2a5084068f2..d7ab158af5d3 100644
--- a/upstart-jobs/ejabberd.nix
+++ b/upstart-jobs/ejabberd.nix
@@ -24,7 +24,7 @@ in
             fi
 	    
 	    mkdir -p ${cfg.confDir}
-	    sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+	    test -f ${cfg.confDir}/ejabberd.cfg || sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
       end script
       
       respawn ${pkgs.bash}/bin/sh -c 'export PATH=$PATH:${pkgs.ejabberd}/sbin; cd ~; ejabberdctl --logs ${cfg.logsDir} --spool ${cfg.spoolDir} --config ${cfg.confDir}/ejabberd.cfg start; sleep 1d'