]>
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 | |
95eb0577 AM |
3 | +++ ejabberd-14.07/ejabberdctl.template 2014-10-15 09:38:33.692517899 +0200 |
4 | @@ -8,6 +8,7 @@ | |
5 | ERL_MAX_ETS_TABLES=1400 | |
6 | FIREWALL_WINDOW="" | |
7 | ERLANG_NODE=ejabberd@localhost | |
8 | +HOME=/home/services/jabber; export HOME | |
9 | ||
10 | # define default environment variables | |
11 | SCRIPT_DIR=`cd ${0%/*} && pwd` | |
9a49bff8 AM |
12 | @@ -28,7 +28,7 @@ if [ "$INSTALLUSER" != "" ] ; then |
13 | mkdir -p "$INSTALLUSER_HOME" | |
14 | chown "$INSTALLUSER" "$INSTALLUSER_HOME" | |
15 | fi | |
16 | - EXEC_CMD="su $INSTALLUSER -c" | |
17 | + EXEC_CMD="su -s /bin/sh $INSTALLUSER -c" | |
eb1d4331 AM |
18 | fi |
19 | done | |
20 | if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then | |
95eb0577 | 21 | @@ -55,7 +56,7 @@ |
9a6073b0 JK |
22 | |
23 | # Define ejabberd variable if they have not been defined from the command line | |
c6f5b587 AM |
24 | if [ "$ETC_DIR" = "" ] ; then |
25 | - ETC_DIR={{sysconfdir}}/ejabberd | |
6a8ab624 | 26 | + ETC_DIR={{sysconfdir}}/jabber |
9a6073b0 JK |
27 | fi |
28 | if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then | |
c6f5b587 | 29 | EJABBERDCTL_CONFIG_PATH=$ETC_DIR/ejabberdctl.cfg |
95eb0577 | 30 | @@ -103,7 +104,7 @@ |
fcf4c7a2 JK |
31 | SASL_LOG_PATH=$LOGS_DIR/erlang.log |
32 | DATETIME=`date "+%Y%m%d-%H%M%S"` | |
33 | ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump | |
c6f5b587 AM |
34 | -ERL_INETRC=$ETC_DIR/inetrc |
35 | +ERL_INETRC=$ETC_DIR/ejabberd-inetrc | |
fcf4c7a2 JK |
36 | |
37 | # define erl parameters | |
c6f5b587 | 38 | ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS" |
eb1d4331 AM |
39 | diff -urN ejabberd-14.07.org/Makefile.in ejabberd-14.07/Makefile.in |
40 | --- ejabberd-14.07.org/Makefile.in 2014-07-22 17:42:49.000000000 +0200 | |
41 | +++ ejabberd-14.07/Makefile.in 2014-10-15 09:32:42.603846549 +0200 | |
42 | @@ -9,7 +9,7 @@ | |
43 | DESTDIR = | |
44 | ||
45 | # /etc/ejabberd/ | |
46 | -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd | |
47 | +ETCDIR = $(DESTDIR)@sysconfdir@/jabber | |
48 | ||
49 | # /sbin/ | |
50 | SBINDIR = $(DESTDIR)@sbindir@ | |
51 | @@ -123,7 +123,7 @@ | |
52 | [ -f $(ETCDIR)/ejabberdctl.cfg ] \ | |
53 | && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ | |
54 | || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg | |
55 | - $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc | |
56 | + $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc | |
57 | # | |
58 | # Administration script | |
59 | [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) |