diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-02-24 19:21:48 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-02-24 19:21:48 +0000 |
| commit | 68fc0eb08cbb2a5380ffcd04fe6530183c8a32b9 (patch) | |
| tree | ab70407dcce0c168d4257178598572c3b4c78ed1 /scripts | |
| parent | 3f5c0fce99c119abbe27ca1dd05e4bf57f27db3e (diff) | |
| parent | 6381790521e37666d772654106112763ddc46071 (diff) | |
| download | rabbitmq-server-git-68fc0eb08cbb2a5380ffcd04fe6530183c8a32b9.tar.gz | |
merge v1_5 into default
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-multi | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 164c5e187c..4cf0703a4c 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -30,7 +30,7 @@ ## Contributor(s): ______________________________________. ## -[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq +[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf [ "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 9a35c47721..6273804f56 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -30,7 +30,7 @@ ## Contributor(s): ______________________________________. ## -[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq +[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit @@ -43,7 +43,7 @@ -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \ -kernel inet_default_connect_options [{nodelay,true}]" [ "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 +[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} |