c8ed115508
* Adapt all patches. * Use the new configure option enable-system-deps even though there is still a patch needed to correct includes. * Disable graphics to not depends on X libraries. Disable also mod_avatar from the default loaded modules, since this module requires graphics enabled. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
33 lines
935 B
Diff
33 lines
935 B
Diff
From 168d5840dc2a541ec16385e666c1932cf02907e9 Mon Sep 17 00:00:00 2001
|
|
From: Johan Oudinet <johan.oudinet@gmail.com>
|
|
Date: Wed, 10 Jan 2018 15:00:07 +0100
|
|
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>
|
|
---
|
|
ejabberdctl.template | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ejabberdctl.template b/ejabberdctl.template
|
|
index 83637766..5a8a8795 100755
|
|
--- a/ejabberdctl.template
|
|
+++ b/ejabberdctl.template
|
|
@@ -15,7 +15,10 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd)
|
|
ERL="{{erl}}"
|
|
IEX="{{bindir}}/iex"
|
|
EPMD="{{epmd}}"
|
|
-INSTALLUSER="{{installuser}}"
|
|
+INSTALLUSER=ejabberd
|
|
+
|
|
+# Read default configuration file if present
|
|
+[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd
|
|
|
|
# check the proper system user is used
|
|
case $(id -un) in
|
|
--
|
|
2.14.1
|
|
|