diff options
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index d5a5948f48..1b95d9efb1 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -69,7 +69,8 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -s rabbit_prelaunch \ ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \ -conf_dir "${RABBITMQ_GENERATED_CONFIG_DIR}" \ - -conf_gen_script "`dirname $0`/cuttlefish" \ + -conf_script_dir "`dirname $0`" \ + -conf_additional "${RABBITMQ_CONFIG_ADDITIONAL}" \ -extra "${RABBITMQ_NODENAME}" PRELAUNCH_RESULT=$? @@ -88,7 +89,7 @@ set -e if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then - RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} -conf_gen_script `dirname $0`/cuttlefish" + RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} -conf_script_dir `dirname $0` -conf_additional ${RABBITMQ_CONFIG_ADDITIONAL}" fi RABBITMQ_LISTEN_ARG= |