summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorAlexey Lebedeff <alebedev@mirantis.com>2016-03-11 17:42:15 +0300
committerAlexey Lebedeff <alebedev@mirantis.com>2016-03-11 19:10:19 +0300
commit2d6383bade61fea0b8652b72d25bb1a9f0d6133f (patch)
tree686b960de5dddf13fa8e31011e94e9a7115fd608 /packaging
parent2ed6627c178b22851ad359f2243a4d474a2e46e5 (diff)
downloadrabbitmq-server-git-2d6383bade61fea0b8652b72d25bb1a9f0d6133f.tar.gz
Improve systemd integration
Hopefully this patch will fix all systemd-related problems: - Proxy shell process (which converts signals to `rabbitmqtl stop`) will no longer be started under systemd. There is no need in it, as systemd unit already contains instructions for graceful shutdown. - Ready notification for systemd will be sent with the help of `socat`, as `systemd-notify` is currently broken for non-root users. `socat` is the most lightweight way to do it (other options are using NIF or some external helper in Perl). - epmd will not be able to interfere by sending it's own ready notifications. - systemd journal will contain some additional messages about startup and shutdown sequence, just to be sure that everything is working correctly. Fixes #664
Diffstat (limited to 'packaging')
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec2
-rw-r--r--packaging/debs/Debian/debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 2826ad3ffc..dc389f22b2 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -11,7 +11,7 @@ Source2: rabbitmq-server.logrotate
URL: http://www.rabbitmq.com/
BuildArch: noarch
BuildRequires: erlang >= R16B-03, python-simplejson, xmlto, libxslt, gzip, sed, zip, rsync
-Requires: erlang >= R16B-03, logrotate
+Requires: erlang >= R16B-03, logrotate, socat
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root
Summary: The RabbitMQ server
Requires(post): %%REQUIRES%%
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 56acaa948e..9cf494ab87 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -18,7 +18,7 @@ Standards-Version: 3.9.4
Package: rabbitmq-server
Architecture: all
-Depends: erlang-nox (>= 1:16.b.3) | esl-erlang, adduser, logrotate, ${misc:Depends}
+Depends: erlang-nox (>= 1:16.b.3) | esl-erlang, adduser, logrotate, socat, ${misc:Depends}
Description: Multi-protocol messaging broker
RabbitMQ is an open source multi-protocol messaging broker.
Homepage: http://www.rabbitmq.com/