summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Garnock-Jones <tonyg@lshift.net>2008-12-09 11:40:05 +0000
committerTony Garnock-Jones <tonyg@lshift.net>2008-12-09 11:40:05 +0000
commita88a7e1701d480e28f193a0bc7c7448fc3424e67 (patch)
tree0b9249387c2c3fcd3a528c85bca5531b3cab6f6a
parent702b811f6e7c0f8ad6524bc017d3cc0d1a417808 (diff)
downloadrabbitmq-server-a88a7e1701d480e28f193a0bc7c7448fc3424e67.tar.gz
Only source /etc/default/rabbitmq if it exists!
-rwxr-xr-xscripts/rabbitmq-mnesia-current2
-rwxr-xr-xscripts/rabbitmq-multi2
-rwxr-xr-xscripts/rabbitmq-server2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmq-mnesia-current b/scripts/rabbitmq-mnesia-current
index fc500af9..edef1c3f 100755
--- a/scripts/rabbitmq-mnesia-current
+++ b/scripts/rabbitmq-mnesia-current
@@ -24,7 +24,7 @@
## Contributor(s): ______________________________________.
##
-. /etc/default/rabbitmq
+[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq
[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 4441ea8e..1fa40273 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -24,7 +24,7 @@
## Contributor(s): ______________________________________.
##
-. /etc/default/rabbitmq
+[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index ab97c3ed..d6b8b168 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -24,7 +24,7 @@
## Contributor(s): ______________________________________.
##
-. /etc/default/rabbitmq
+[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit