summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-03-11 18:27:48 +0000
committerMatthew Sackman <matthew@lshift.net>2010-03-11 18:27:48 +0000
commit8e7dd01dc00d3d1aeda0c6b9418ee16c73e3d3b4 (patch)
tree213cae3019790b8ef2319bdbe845367f08bd966e
parentcbc1e6f982cdd356a805f5d60525f750baf725ab (diff)
downloadrabbitmq-server-8e7dd01dc00d3d1aeda0c6b9418ee16c73e3d3b4.tar.gz
Well it nearly works...
-rw-r--r--packaging/common/rabbitmq-server.ocf17
1 files changed, 8 insertions, 9 deletions
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf
index dbc7e531..6edcb38d 100644
--- a/packaging/common/rabbitmq-server.ocf
+++ b/packaging/common/rabbitmq-server.ocf
@@ -189,15 +189,14 @@ RABBITMQ_MNESIA_BASE=$OCF_RESKEY_mnesia_base
RABBITMQ_SERVER_START_ARGS=$OCF_RESKEY_server_start_args
[ ! -z $RABBITMQ_NODENAME ] && NODENAME_ARG="-n $RABBITMQ_NODENAME"
-export \
- RABBITMQ_NODENAME \
- RABBITMQ_NODE_IP_ADDRESS \
- RABBITMQ_NODE_PORT \
- RABBITMQ_CLUSTER_CONFIG_FILE \
- RABBITMQ_CONFIG_FILE \
- RABBITMQ_LOG_BASE \
- RABBITMQ_MNESIA_BASE \
- RABBITMQ_SERVER_START_ARGS
+[ ! -z $RABBITMQ_NODENAME ] && export RABBITMQ_NODENAME
+[ ! -z $RABBITMQ_NODE_IP_ADDRESS ] && export RABBITMQ_NODE_IP_ADDRESS
+[ ! -z $RABBITMQ_NODE_PORT ] && export RABBITMQ_NODE_PORT
+[ ! -z $RABBITMQ_CLUSTER_CONFIG_FILE ] && export RABBITMQ_CLUSTER_CONFIG_FILE
+[ ! -z $RABBITMQ_CONFIG_FILE ] && export RABBITMQ_CONFIG_FILE
+[ ! -z $RABBITMQ_LOG_BASE ] && export RABBITMQ_LOG_BASE
+[ ! -z $RABBITMQ_MNESIA_BASE ] && export RABBITMQ_MNESIA_BASE
+[ ! -z $RABBITMQ_SERVER_START_ARGS ] && export RABBITMQ_SERVER_START_ARGS
rabbit_validate() {
if [ ! -x $RABBITMQ_MULTI ]; then