Up to 21.07.

[packages/ejabberd.git] / ejabberd-paths.patch

diff --git a/ejabberd-paths.patch b/ejabberd-paths.patch
index d356977a6abb4b5539310678192bc2cfc4d44bc3..2638dfd0490a6859e867f474e97ae5e2d624103a 100644 (file)
--- a/ejabberd-paths.patch
+++ b/ejabberd-paths.patch
@@ -1,16 +1,16 @@
-diff -dur -x '*~' ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
---- ejabberd-13.10.orig/Makefile.in    2013-09-27 11:19:22.000000000 +0200
-+++ ejabberd-13.10/Makefile.in 2013-11-14 22:08:25.461196174 +0100
-@@ -9,7 +9,7 @@
+diff -urNp -x '*.orig' ejabberd-21.01.org/Makefile.in ejabberd-21.01/Makefile.in
+--- ejabberd-21.01.org/Makefile.in     2021-01-29 10:01:29.000000000 +0100
++++ ejabberd-21.01/Makefile.in 2021-03-03 14:25:43.980087766 +0100
+@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
  DESTDIR =
  
  # /etc/ejabberd/
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
 +ETCDIR = $(DESTDIR)@sysconfdir@/jabber
  
- # /sbin/
- SBINDIR = $(DESTDIR)@sbindir@
-@@ -123,7 +123,7 @@
+ # /bin/
+ BINDIR = $(DESTDIR)@bindir@
+@@ -249,7 +249,7 @@ install: copy-files
        [ -f $(ETCDIR)/ejabberdctl.cfg ] \
                && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
                || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
@@ -19,25 +19,32 @@ diff -dur -x '*~' ejabberd-13.10.orig/Makefile.in ejabberd-13.10/Makefile.in
        #
        # Administration script
        [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
-diff -dur -x '*~' ejabberd-13.10.orig/ejabberdctl.template ejabberd-13.10/ejabberdctl.template
---- ejabberd-13.10.orig/ejabberdctl.template   2013-09-27 11:19:22.000000000 +0200
-+++ ejabberd-13.10/ejabberdctl.template        2013-11-14 22:08:57.068093561 +0100
-@@ -55,7 +55,7 @@
+diff -urNp -x '*.orig' ejabberd-21.01.org/ejabberdctl.template ejabberd-21.01/ejabberdctl.template
+--- ejabberd-21.01.org/ejabberdctl.template    2021-01-29 10:01:29.000000000 +0100
++++ ejabberd-21.01/ejabberdctl.template        2021-03-03 14:25:43.973420891 +0100
+@@ -9,6 +9,7 @@ ERL_MAX_ETS_TABLES=1400
+ FIREWALL_WINDOW=""
+ INET_DIST_INTERFACE=""
+ ERLANG_NODE=ejabberd@localhost
++HOME=/home/services/jabber; export HOME
  
- # Define ejabberd variable if they have not been defined from the command line
- if [ "$ETC_DIR" = "" ] ; then
--    ETC_DIR={{sysconfdir}}/ejabberd
-+    ETC_DIR={{sysconfdir}}/jabberd
- fi
- if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
-     EJABBERDCTL_CONFIG_PATH=$ETC_DIR/ejabberdctl.cfg
-@@ -103,7 +103,7 @@
- SASL_LOG_PATH=$LOGS_DIR/erlang.log
- DATETIME=`date "+%Y%m%d-%H%M%S"`
- ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
--ERL_INETRC=$ETC_DIR/inetrc
-+ERL_INETRC=$ETC_DIR/ejabberd-inetrc
+ # define default environment variables
+ [ -z "$SCRIPT" ] && SCRIPT=$0
+@@ -55,7 +56,7 @@ while [ $# -gt 0 ]; do
+ done
  
- # define erl parameters
- ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
-
+ # define ejabberd variables if not already defined from the command line
+-: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
++: "${ETC_DIR:="{{sysconfdir}}/jabber"}"
+ : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
+ : "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
+ : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
+@@ -83,7 +84,7 @@ fi
+ [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
+ ERL_LIBS={{libdir}}
+ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
+-ERL_INETRC="$ETC_DIR"/inetrc
++ERL_INETRC="$ETC_DIR"/ejabberd-inetrc
+ 
+ # define ejabberd parameters
+ EJABBERD_OPTS="$EJABBERD_OPTS\