--- src/ejabberdctl.template	2009-11-06 22:53:19.000000000 +0300
+++ src/ejabberdctl.template	2009-12-10 21:07:28.648659178 +0300
@@ -9,10 +9,10 @@
 
 # define default environment variables
 NODE=ejabberd
-HOST=localhost
+HOST=`hostname -s 2>/dev/null || echo "localhost"`
 ERLANG_NODE=$NODE@$HOST
 ERL=@erl@
-INSTALLUSER=@installuser@
+INSTALLUSER=ejabberd
 
 # parse command line parameters
 ARGS=
@@ -46,7 +46,7 @@
     LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
 fi
 if [ "$SPOOLDIR" = "" ] ; then
-    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
+    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd/spool
 fi
 if [ "$EJABBERD_DOC_PATH" = "" ] ; then
     EJABBERD_DOC_PATH=@DOCDIR@
@@ -60,14 +60,14 @@
 EJID=`id -g $INSTALLUSER`
 EXEC_CMD="false"
 if [ $ID -eq 0 ] ; then
-	EXEC_CMD="su ${INSTALLUSER} -c"
+	EXEC_CMD="/sbin/runuser -s /bin/bash -p ejabberd -c"
 fi
 if [ "$ID" -eq "$EJID" ] ; then
 	EXEC_CMD="sh -c"
 fi
 if [ "$EXEC_CMD" = "false" ] ; then
 	echo "This command can only be run by root or the user $INSTALLUSER" >&2
-	exit 1
+	exit 4
 fi
 
 NAME=-name