--- src/ejabberdctl.template~	2010-01-29 15:03:48.000000000 +0300
+++ src/ejabberdctl.template	2010-01-29 15:07:58.867786945 +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
 
 # Control number of connections identifiers
 # using flock if available. Expects a linux-style
@@ -53,7 +53,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@
@@ -69,7 +69,7 @@
 EXEC_CMD="false"
 for GID in $GIDS; do
     if [ $GID -eq 0 ] ; then
-	EXEC_CMD="su ${INSTALLUSER} -p -c"
+	EXEC_CMD="/sbin/runuser -s /bin/bash -p ejabberd -c"
     fi
 done
 if [ "$ID" -eq "$EJID" ] ; then
@@ -77,7 +77,7 @@
 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