summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Barlow <randy@electronsweatshop.com>2016-03-06 01:14:54 -0500
committerRandy Barlow <randy@electronsweatshop.com>2016-03-06 01:14:54 -0500
commit95ac9cc3877d2eac0e8c3765e7a8c8f628cef6ce (patch)
treed5ea1fe5c4f8458b7e263dc9f7fe7233dfbc7001
parenta904df504a98eb68828f3a0e73164ae41b89ecf9 (diff)
downloadejabberd-95ac9cc3877d2eac0e8c3765e7a8c8f628cef6ce.tar.gz
ejabberd-95ac9cc3877d2eac0e8c3765e7a8c8f628cef6ce.tar.xz
ejabberd-95ac9cc3877d2eac0e8c3765e7a8c8f628cef6ce.zip
Run ejabberdctl with bash when stopping in the unit file (#1314753).
-rw-r--r--ejabberd.service2
-rw-r--r--ejabberd.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/ejabberd.service b/ejabberd.service
index 2fe9048..902e694 100644
--- a/ejabberd.service
+++ b/ejabberd.service
@@ -14,7 +14,7 @@ ExecStart=/usr/bin/bash /usr/bin/ejabberdctl \
--ctl-config /etc/ejabberd/ejabberdctl.cfg \
--logs "/var/log/ejabberd" \
--spool "/var/lib/ejabberd" start
-ExecStop=/usr/bin/ejabberdctl stop
+ExecStop=/usr/bin/bash /usr/bin/ejabberdctl stop
RemainAfterExit=yes
[Install]
diff --git a/ejabberd.spec b/ejabberd.spec
index 4dda024..f18b57e 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -12,7 +12,7 @@
Name: ejabberd
Version: 16.01
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
License: GPLv2+
@@ -360,6 +360,9 @@ fi)
%changelog
+* Sun Mar 06 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-4
+- Run ejabberdctl with bash when stopping in the unit file (#1314753).
+
* Sun Feb 28 2016 Randy Barlow <rbarlow@redhat.com> - 16.01-3
- Set permissions to 755 on ejabberdctl so the ejabberd user can start the daemon (#1312709).
- Drop the commented deps source, as it is not used.