- rabbitmq-server.service: switch to type=Notify in order to

avoid cookie creation race

OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=60
This commit is contained in:
Dirk Mueller 2015-06-24 13:23:12 +00:00 committed by Git OBS Bridge
parent 4395510887
commit 17e59cee56
3 changed files with 12 additions and 7 deletions

View File

@ -1,6 +1,8 @@
--- Makefile.orig 2013-03-13 11:32:13.354753804 +0100 Index: Makefile
+++ Makefile 2013-03-13 11:32:32.695820378 +0100 ===================================================================
@@ -110,7 +110,6 @@ --- Makefile.orig
+++ Makefile
@@ -120,7 +120,6 @@ plugins:
mkdir -p $(PLUGINS_DIR) mkdir -p $(PLUGINS_DIR)
PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/$(PLUGINS_DIR)" VERSION=$(VERSION) PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/$(PLUGINS_DIR)" VERSION=$(VERSION)
echo "Put your EZs here and use rabbitmq-plugins to enable them." > $(PLUGINS_DIR)/README echo "Put your EZs here and use rabbitmq-plugins to enable them." > $(PLUGINS_DIR)/README

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 24 13:22:48 UTC 2015 - dmueller@suse.com
- rabbitmq-server.service: switch to type=Notify in order to
avoid cookie creation race
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 23 17:26:24 UTC 2015 - tbechtold@suse.com Tue Jun 23 17:26:24 UTC 2015 - tbechtold@suse.com

View File

@ -4,15 +4,12 @@ After=epmd.socket syslog.target network.target
Requires=epmd.socket Requires=epmd.socket
[Service] [Service]
Type=simple Type=notify
User=rabbitmq User=rabbitmq
Group=rabbitmq Group=rabbitmq
Environment=RABBITMQ_PID_FILE=/var/run/rabbitmq/pid
WorkingDirectory=/var/lib/rabbitmq WorkingDirectory=/var/lib/rabbitmq
ExecStart=/usr/sbin/rabbitmq-server ExecStart=/usr/sbin/rabbitmq-server
ExecStartPost=/usr/sbin/rabbitmqctl wait /var/run/rabbitmq/pid
ExecStop=/usr/sbin/rabbitmqctl stop ExecStop=/usr/sbin/rabbitmqctl stop
ExecStopPost=/usr/bin/rm /var/run/rabbitmq/pid
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target