From 3d79201a406855c3d717c58dd9932a43cab57b86 Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Wed, 25 Jun 2014 13:18:58 +0200 Subject: [PATCH] RabbitMQ element: Move /var/run/rabbitmq Move creation of the folder /var/run/rabbitmq so that it get's created before the server is started. Closes-Bug: #1334235 Change-Id: I0bf2a6ba3bb36c0155752c2de0e2caed25b9a265 --- elements/rabbitmq-server/install.d/20-rabbitmq-server | 4 ++++ .../os-refresh-config/post-configure.d/40-rabbitmq | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/elements/rabbitmq-server/install.d/20-rabbitmq-server b/elements/rabbitmq-server/install.d/20-rabbitmq-server index 136d410bc..64515b2f7 100755 --- a/elements/rabbitmq-server/install.d/20-rabbitmq-server +++ b/elements/rabbitmq-server/install.d/20-rabbitmq-server @@ -29,12 +29,16 @@ respawn limit 2 5 env OS_SVC_ENABLE_CONTROL=1 export OS_SVC_ENABLE_CONTROL +pre-start script + [ -d "/var/run/rabbitmq" ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq /var/run/rabbitmq +end script exec /usr/sbin/rabbitmq-server > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err post-start exec /usr/sbin/rabbitmqctl wait /var/run/rabbitmq/pid >/dev/null 2>&1 pre-stop exec /usr/sbin/rabbitmqctl stop /var/run/rabbitmq/pid >/dev/null 2>&1 # Get the Erlang nameserver too. post-stop exec /usr/bin/pkill -u rabbitmq >/dev/null 2>&1 + eof fi diff --git a/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq b/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq index d533d5136..7ecfe85b0 100755 --- a/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq +++ b/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq @@ -2,7 +2,6 @@ set -eux -[ -d /var/run/rabbitmq ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq /var/run/rabbitmq [ -d /mnt/state/var/log/rabbitmq ] || install -d -D -m 0770 -o rabbitmq -g rabbitmq /mnt/state/var/log/rabbitmq os-svc-enable -n rabbitmq-server