diff options
| author | Steve Powell <steve@rabbitmq.com> | 2012-02-02 10:41:26 +0000 |
|---|---|---|
| committer | Steve Powell <steve@rabbitmq.com> | 2012-02-02 10:41:26 +0000 |
| commit | 5e35fa65b28d9966defab60e4e0848c04b641079 (patch) | |
| tree | 3934d3e504183a600a3ae54906e6415a9847bf01 /scripts/rabbitmq-env | |
| parent | 9b6c99384e421f767d3b353ad9f0d793f3072d28 (diff) | |
| parent | ac8c7a57af4b381d44a62ef0ba0447c1740072af (diff) | |
| download | rabbitmq-server-git-5e35fa65b28d9966defab60e4e0848c04b641079.tar.gz | |
Merge default in.
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index a2ef8d3ceb..dd7abd346f 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -36,7 +36,16 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname` NODENAME=rabbit@${HOSTNAME%%.*} -# Load configuration from the rabbitmq.conf file +## Set system default values for rabbitmq-env.conf variables to override +if [ ! -f ${SCRIPT_DIR}/rabbitmq-sys ]; then + echo -n "WARNING: system defaults are not available -- " + echo "check the installation completed correctly." + exit 1 +fi + +. ${SCRIPT_DIR}/rabbitmq-sys + +## Get configuration variables from the rabbitmq-env.conf file if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ [ ! -f /etc/rabbitmq/rabbitmq-env.conf ] ; then echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- " |