diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:30:38 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-10 14:30:38 +0000 |
| commit | aa8d7f00d3ae279a0bac46137933540b009aa86d (patch) | |
| tree | 47b1637f3df7d8f895ba2b5f85f8f92f35232327 /scripts/rabbitmq-server | |
| parent | 32b59f88115699f139a15621aaa36c01542c20fe (diff) | |
| download | rabbitmq-server-git-aa8d7f00d3ae279a0bac46137933540b009aa86d.tar.gz | |
Do not generate config in prelaunch. Copy rabbitmq.schema to SCHEMA_DIR
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 088379d20d..da76b4708e 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -68,8 +68,6 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -hidden \ -s rabbit_prelaunch \ ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \ - -conf_dir "${RABBITMQ_GENERATED_CONFIG_DIR}" \ - -conf_script_dir "`dirname $0`" \ -conf_advanced "${RABBITMQ_CONFIG_ADVANCED}" \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ @@ -86,6 +84,10 @@ else exit ${PRELAUNCH_RESULT} fi +if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then + cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}" +fi + set -e if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then |