35d46ba365
There are new dependencies: erlang-p1-jiffy, erlang-p1-oauth2, erlang-p1-stun, erlang-p1-tls, erlang-p1-utils, erlang-p1-xmpp as well as two host dependencies on erlang-p1-utils and erlang-p1-xmpp. Otherwise the compilation via rebar fails. 4 patches have been refreshed and a new patch have been introduced to tell rebar to use host dependencies instead of trying to download them. Hopefully this patch could be drop in ejabberd 17.06. Missing SoB in patches have been added as well. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
29 lines
897 B
Diff
29 lines
897 B
Diff
From 53d7d654026afa163a55b860e33c6901129e8dc1 Mon Sep 17 00:00:00 2001
|
|
From: Johan Oudinet <johan.oudinet@gmail.com>
|
|
Date: Wed, 20 Jan 2016 09:35:07 -0500
|
|
Subject: [PATCH] fix ejabberdctl
|
|
|
|
Change default values so ejabberdctl run commands as ejabberd user
|
|
Also add a way for the user to change default values.
|
|
|
|
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
|
|
|
diff --git a/ejabberdctl.template b/ejabberdctl.template
|
|
index 5b34ebee..51acaca8 100755
|
|
--- a/ejabberdctl.template
|
|
+++ b/ejabberdctl.template
|
|
@@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd`
|
|
ERL={{erl}}
|
|
IEX={{bindir}}/iex
|
|
EPMD={{epmd}}
|
|
-INSTALLUSER={{installuser}}
|
|
+INSTALLUSER=ejabberd
|
|
ERL_LIBS={{libdir}}
|
|
|
|
+# Read default configuration file if present
|
|
+[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd
|
|
+
|
|
# check the proper system user is used if defined
|
|
if [ "$INSTALLUSER" != "" ] ; then
|
|
EXEC_CMD="false"
|