projects / packages / ejabberd.git / blame
| Commit | Line | Data |
|---|---|---|
| 59e0d76f AM |
1 | diff -urNp -x '*.orig' ejabberd-21.01.org/Makefile.in ejabberd-21.01/Makefile.in |
| 2 | --- ejabberd-21.01.org/Makefile.in 2021-01-29 10:01:29.000000000 +0100 | |
| 3 | +++ ejabberd-21.01/Makefile.in 2021-03-03 14:25:43.980087766 +0100 | |
| 4 | @@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@ | |
| 5 | DESTDIR = | |
| 6 | ||
| 7 | # /etc/ejabberd/ | |
| 8 | -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd | |
| 9 | +ETCDIR = $(DESTDIR)@sysconfdir@/jabber | |
| 10 | ||
| 11 | # /bin/ | |
| 12 | BINDIR = $(DESTDIR)@bindir@ | |
| 13 | @@ -249,7 +249,7 @@ install: copy-files | |
| 14 | [ -f $(ETCDIR)/ejabberdctl.cfg ] \ | |
| 15 | && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ | |
| 16 | || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg | |
| 17 | - $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc | |
| 18 | + $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc | |
| 19 | # | |
| 20 | # Administration script | |
| 21 | [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) | |
| 22 | diff -urNp -x '*.orig' ejabberd-21.01.org/ejabberdctl.template ejabberd-21.01/ejabberdctl.template | |
| 23 | --- ejabberd-21.01.org/ejabberdctl.template 2021-01-29 10:01:29.000000000 +0100 | |
| 24 | +++ ejabberd-21.01/ejabberdctl.template 2021-03-03 14:25:43.973420891 +0100 | |
| 25 | @@ -9,6 +9,7 @@ ERL_MAX_ETS_TABLES=1400 | |
| 95eb0577 | 26 | FIREWALL_WINDOW="" |
| 59e0d76f | 27 | INET_DIST_INTERFACE="" |
| 95eb0577 AM |
28 | ERLANG_NODE=ejabberd@localhost |
| 29 | +HOME=/home/services/jabber; export HOME | |
| 30 | ||
| 31 | # define default environment variables | |
| 1f6376e0 | 32 | [ -z "$SCRIPT" ] && SCRIPT=$0 |
| 59e0d76f | 33 | @@ -55,7 +56,7 @@ while [ $# -gt 0 ]; do |
| ac7e9a78 | 34 | done |
| 9a6073b0 | 35 | |
| ac7e9a78 AM |
36 | # define ejabberd variables if not already defined from the command line |
| 37 | -: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}" | |
| 38 | +: "${ETC_DIR:="{{sysconfdir}}/jabber"}" | |
| 39 | : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}" | |
| 40 | : "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}" | |
| 41 | : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}" | |
| 59e0d76f AM |
42 | @@ -83,7 +84,7 @@ fi |
| 43 | [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS" | |
| ac7e9a78 AM |
44 | ERL_LIBS={{libdir}} |
| 45 | ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump | |
| 46 | -ERL_INETRC="$ETC_DIR"/inetrc | |
| 47 | +ERL_INETRC="$ETC_DIR"/ejabberd-inetrc | |
| fcf4c7a2 | 48 | |
| ac7e9a78 AM |
49 | # define ejabberd parameters |
| 50 | EJABBERD_OPTS="$EJABBERD_OPTS\ |