]>
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` | |
ac7e9a78 AM |
12 | @@ -58,7 +58,7 @@ for arg; do |
13 | done | |
9a6073b0 | 14 | |
ac7e9a78 AM |
15 | # define ejabberd variables if not already defined from the command line |
16 | -: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}" | |
17 | +: "${ETC_DIR:="{{sysconfdir}}/jabber"}" | |
18 | : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}" | |
19 | : "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}" | |
20 | : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" | |
21 | @@ -82,7 +82,7 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then | |
9a6073b0 | 22 | fi |
ac7e9a78 AM |
23 | ERL_LIBS={{libdir}} |
24 | ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump | |
25 | -ERL_INETRC="$ETC_DIR"/inetrc | |
26 | +ERL_INETRC="$ETC_DIR"/ejabberd-inetrc | |
fcf4c7a2 | 27 | |
ac7e9a78 AM |
28 | # define ejabberd parameters |
29 | EJABBERD_OPTS="$EJABBERD_OPTS\ | |
eb1d4331 AM |
30 | diff -urN ejabberd-14.07.org/Makefile.in ejabberd-14.07/Makefile.in |
31 | --- ejabberd-14.07.org/Makefile.in 2014-07-22 17:42:49.000000000 +0200 | |
32 | +++ ejabberd-14.07/Makefile.in 2014-10-15 09:32:42.603846549 +0200 | |
33 | @@ -9,7 +9,7 @@ | |
34 | DESTDIR = | |
35 | ||
36 | # /etc/ejabberd/ | |
37 | -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd | |
38 | +ETCDIR = $(DESTDIR)@sysconfdir@/jabber | |
39 | ||
40 | # /sbin/ | |
41 | SBINDIR = $(DESTDIR)@sbindir@ | |
42 | @@ -123,7 +123,7 @@ | |
43 | [ -f $(ETCDIR)/ejabberdctl.cfg ] \ | |
44 | && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ | |
45 | || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg | |
46 | - $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc | |
47 | + $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc | |
48 | # | |
49 | # Administration script | |
50 | [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) |