diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-17 09:32:14 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-17 09:32:14 +0000 |
| commit | a0f01adceb01d744e4cf79edaaf6dd517c04387f (patch) | |
| tree | a0da16f7a3ba80ca09cdfd533d7e9b82904cc795 /scripts/rabbitmq-server | |
| parent | 458b59adcb45b5e3b77dcb8f991b3fd8f9a705bf (diff) | |
| download | rabbitmq-server-git-a0f01adceb01d744e4cf79edaaf6dd517c04387f.tar.gz | |
rename env variable CONFIG_ADVANCED to ADVANCED_CONFIG_FILE
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index da76b4708e..9a4f1d5cbd 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -68,7 +68,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -hidden \ -s rabbit_prelaunch \ ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \ - -conf_advanced "${RABBITMQ_CONFIG_ADVANCED}" \ + -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ -extra "${RABBITMQ_NODENAME}" @@ -97,11 +97,10 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ -conf_script_dir `dirname $0` \ -conf_schema_dir ${RABBITMQ_SCHEMA_DIR}" - echo "${RABBITMQ_CONFIG_ADVANCED}.config" - if [ -f "${RABBITMQ_CONFIG_ADVANCED}.config" ]; then + if [ -f "${RABBITMQ_ADVANCED_CONFIG_FILE}.config" ]; then RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \ - -conf_advanced ${RABBITMQ_CONFIG_ADVANCED} \ - -config ${RABBITMQ_CONFIG_ADVANCED}" + -conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \ + -config ${RABBITMQ_ADVANCED_CONFIG_FILE}" fi fi |