From 05b4364cbb97591b12b944ee82da7532c5c32b92 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Thu, 9 Oct 2014 10:34:19 -0400
Subject: normalize start script name for rabbitmq

this simply makes the source file match the installed name of the
script.

Change-Id: I5e7296780a34f36e28419b49e185be689e4745ad
---
 docker/rabbitmq/Dockerfile       |  2 +-
 docker/rabbitmq/init-rabbitmq.sh | 19 -------------------
 docker/rabbitmq/start.sh         | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100755 docker/rabbitmq/init-rabbitmq.sh
 create mode 100755 docker/rabbitmq/start.sh

(limited to 'docker')

diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index 32b1c71ae..925bc6960 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -4,5 +4,5 @@ MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
 RUN yum -y install rabbitmq-server; yum clean all
 ADD rabbitmq.config /etc/rabbitmq/
 ADD rabbitmq-env.conf /etc/rabbitmq/
-ADD init-rabbitmq.sh /start.sh
+ADD start.sh /start.sh
 CMD ["/start.sh"]
diff --git a/docker/rabbitmq/init-rabbitmq.sh b/docker/rabbitmq/init-rabbitmq.sh
deleted file mode 100755
index be69af7d5..000000000
--- a/docker/rabbitmq/init-rabbitmq.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-: ${RABBITMQ_USER:=guest}
-: ${RABBITMQ_PASS:=guest}
-: ${RABBITMQ_NODE_PORT:=5672}
-: ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq}
-
-sed -i '
-	s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g
-	s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g
-' /etc/rabbitmq/rabbitmq.config
-
-sed -i '
-	s|@RABBITMQ_PORT@|'"$RABBITMQ_NODE_PORT"'|g
-	s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g
-' /etc/rabbitmq/rabbitmq-env.conf
-
-exec /usr/lib/rabbitmq/bin/rabbitmq-server
-
diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh
new file mode 100755
index 000000000..be69af7d5
--- /dev/null
+++ b/docker/rabbitmq/start.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+: ${RABBITMQ_USER:=guest}
+: ${RABBITMQ_PASS:=guest}
+: ${RABBITMQ_NODE_PORT:=5672}
+: ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq}
+
+sed -i '
+	s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g
+	s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g
+' /etc/rabbitmq/rabbitmq.config
+
+sed -i '
+	s|@RABBITMQ_PORT@|'"$RABBITMQ_NODE_PORT"'|g
+	s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g
+' /etc/rabbitmq/rabbitmq-env.conf
+
+exec /usr/lib/rabbitmq/bin/rabbitmq-server
+
-- 
cgit v1.2.3