From 5843c59cf0642efd8718e4875469ed026bd45bf07b58e682ff73c7fb52339563 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Mon, 6 Feb 2017 16:06:05 +0000
Subject: [PATCH] Accepting request 455065 from devel:languages:erlang

- IMPORTANT CHANGE
  Require the epmd service instead of running our own version as
  rabbitmq user.
  This requires that you configure epmd to listen on more
  interfaces than just 127.0.0.1.
  For non systemd based distributions you can set EPMD_ADDRESSES in
  /etc/sysconfing/erlang.
  For systemd based distributions please follow
  /usr/share/doc/packages/erlang/README.SUSE
  IMPORTANT CHANGE
  This change is also documented in
  /usr/share/doc/packages/rabbitmq-server/README.SUSE

OBS-URL: https://build.opensuse.org/request/show/455065
OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=71
---
 README.SUSE             | 12 ++++++++++++
 rabbitmq-server.changes | 22 ++++++++++++++++++++++
 rabbitmq-server.init    |  4 ++--
 rabbitmq-server.service |  1 +
 rabbitmq-server.spec    |  5 ++++-
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 README.SUSE

diff --git a/README.SUSE b/README.SUSE
new file mode 100644
index 0000000..fe936cc
--- /dev/null
+++ b/README.SUSE
@@ -0,0 +1,12 @@
+ RabbitMQ and EPMD
+===================
+
+RabbitMQ requires epmd to listen on more interfaces than just localhost.
+The easiest solution is to set the listening address to "0.0.0.0". But
+you can also limit it to certain interfaces/IPs.
+
+For non systemd based distributions you can set EPMD_ADDRESSES in
+/etc/sysconfing/erlang.
+
+For systemd based distributions please follow
+/usr/share/doc/packages/erlang/README.SUSE
diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index b1edf27..378468b 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -3,6 +3,28 @@ Mon Feb  6 15:43:18 UTC 2017 - mrueckert@suse.de
 
 - fix source url
 
+-------------------------------------------------------------------
+Mon Feb  6 15:32:24 UTC 2017 - mrueckert@suse.de
+
+- IMPORTANT CHANGE
+
+  Require the epmd service instead of running our own version as
+  rabbitmq user.
+
+  This requires that you configure epmd to listen on more
+  interfaces than just 127.0.0.1.
+
+  For non systemd based distributions you can set EPMD_ADDRESSES in
+  /etc/sysconfing/erlang.
+
+  For systemd based distributions please follow
+  /usr/share/doc/packages/erlang/README.SUSE
+
+  IMPORTANT CHANGE
+
+  This change is also documented in
+  /usr/share/doc/packages/rabbitmq-server/README.SUSE
+
 -------------------------------------------------------------------
 Tue Jan 17 19:04:59 UTC 2017 - chris@intrbiz.com
 
diff --git a/rabbitmq-server.init b/rabbitmq-server.init
index 1ab8114..6cedb69 100644
--- a/rabbitmq-server.init
+++ b/rabbitmq-server.init
@@ -8,8 +8,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          rabbitmq-server
-# Required-Start:    $local_fs $network $remote_fs
-# Required-Stop:     $local_fs $network $remote_fs
+# Required-Start:    $local_fs $network $remote_fs epmd
+# Required-Stop:     $local_fs $network $remote_fs epmd
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
 # Description:       RabbitMQ broker
diff --git a/rabbitmq-server.service b/rabbitmq-server.service
index 719e096..fd93837 100644
--- a/rabbitmq-server.service
+++ b/rabbitmq-server.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RabbitMQ broker
 After=syslog.target network.target
+Requires=epmd.service
 
 [Service]
 Type=notify
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index df279fc..6aa3e9b 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -39,6 +39,7 @@ Source4:        rabbitmq-server.ocf
 Source5:        rabbitmq-server.sysconfig
 Source6:        rabbitmq-server.service
 Source7:        rabbitmq-server.tmpfiles.d.conf
+Source8:        README.SUSE
 Patch0:         no-nmap.patch
 Patch1:         no-remove-common.patch
 BuildRequires:  erlang
@@ -52,6 +53,7 @@ BuildRequires:  unzip
 BuildRequires:  xmlto
 BuildRequires:  zip
 Requires:       erlang
+Requires:       erlang-epmd
 Requires:       logrotate
 Provides:       AMQP-server
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -106,6 +108,7 @@ This package includes the RabbitMQ AMQP language bindings for Erlang.
 %patch1
 %define _rabbit_server_ocf `basename %{SOURCE4}`
 cp %{SOURCE4} %{_rabbit_server_ocf}
+cp %{SOURCE8} .
 #patch10 -p1
 
 %build
@@ -230,7 +233,7 @@ systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf
 %dir /usr/lib/ocf/resource.d/rabbitmq
 %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
 %config(noreplace) %{_sysconfdir}/rabbitmq/rabbitmq.config
-%doc LICENSE* README
+%doc LICENSE* README README.SUSE
 %dir %{_rabbit_erllibdir}/plugins
 %exclude %{_rabbit_erllibdir}/plugins/*
 %exclude %{_libdir}/erlang/lib/amqp_client*/*