1 diff -urN ejabberd-14.07.org/ejabberdctl.template ejabberd-14.07/ejabberdctl.template
2 --- ejabberd-14.07.org/ejabberdctl.template 2014-07-22 17:42:49.000000000 +0200
3 +++ ejabberd-14.07/ejabberdctl.template 2014-10-15 09:32:59.091076905 +0200
7 if [ $GID -eq 0 ] ; then
8 - EXEC_CMD="su $INSTALLUSER -p -c"
9 + EXEC_CMD="su -s /bin/sh $INSTALLUSER -p -c"
12 if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
15 # Define ejabberd variable if they have not been defined from the command line
16 if [ "$ETC_DIR" = "" ] ; then
17 - ETC_DIR={{sysconfdir}}/ejabberd
18 + ETC_DIR={{sysconfdir}}/jabber
20 if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
21 EJABBERDCTL_CONFIG_PATH=$ETC_DIR/ejabberdctl.cfg
23 SASL_LOG_PATH=$LOGS_DIR/erlang.log
24 DATETIME=`date "+%Y%m%d-%H%M%S"`
25 ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
26 -ERL_INETRC=$ETC_DIR/inetrc
27 +ERL_INETRC=$ETC_DIR/ejabberd-inetrc
29 # define erl parameters
30 ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
31 diff -urN ejabberd-14.07.org/Makefile.in ejabberd-14.07/Makefile.in
32 --- ejabberd-14.07.org/Makefile.in 2014-07-22 17:42:49.000000000 +0200
33 +++ ejabberd-14.07/Makefile.in 2014-10-15 09:32:42.603846549 +0200
38 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
39 +ETCDIR = $(DESTDIR)@sysconfdir@/jabber
42 SBINDIR = $(DESTDIR)@sbindir@
44 [ -f $(ETCDIR)/ejabberdctl.cfg ] \
45 && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
46 || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
47 - $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
48 + $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc
50 # Administration script
51 [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)