]>
Commit | Line | Data |
---|---|---|
eb1d4331 AM |
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 | |
4 | @@ -22,7 +22,7 @@ | |
5 | EXEC_CMD="false" | |
6 | for GID in `id -G`; do | |
7 | if [ $GID -eq 0 ] ; then | |
8 | - EXEC_CMD="su $INSTALLUSER -p -c" | |
9 | + EXEC_CMD="su -s /bin/sh $INSTALLUSER -p -c" | |
10 | fi | |
11 | done | |
12 | if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then | |
c6f5b587 | 13 | @@ -55,7 +55,7 @@ |
9a6073b0 JK |
14 | |
15 | # Define ejabberd variable if they have not been defined from the command line | |
c6f5b587 AM |
16 | if [ "$ETC_DIR" = "" ] ; then |
17 | - ETC_DIR={{sysconfdir}}/ejabberd | |
6a8ab624 | 18 | + ETC_DIR={{sysconfdir}}/jabber |
9a6073b0 JK |
19 | fi |
20 | if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then | |
c6f5b587 AM |
21 | EJABBERDCTL_CONFIG_PATH=$ETC_DIR/ejabberdctl.cfg |
22 | @@ -103,7 +103,7 @@ | |
fcf4c7a2 JK |
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 | |
c6f5b587 AM |
26 | -ERL_INETRC=$ETC_DIR/inetrc |
27 | +ERL_INETRC=$ETC_DIR/ejabberd-inetrc | |
fcf4c7a2 JK |
28 | |
29 | # define erl parameters | |
c6f5b587 | 30 | ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS" |
eb1d4331 AM |
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 | |
34 | @@ -9,7 +9,7 @@ | |
35 | DESTDIR = | |
36 | ||
37 | # /etc/ejabberd/ | |
38 | -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd | |
39 | +ETCDIR = $(DESTDIR)@sysconfdir@/jabber | |
40 | ||
41 | # /sbin/ | |
42 | SBINDIR = $(DESTDIR)@sbindir@ | |
43 | @@ -123,7 +123,7 @@ | |
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 | |
49 | # | |
50 | # Administration script | |
51 | [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) |