diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 16:32:06 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-19 16:32:06 +0000 |
| commit | 7f9f0d2bc5dcc20eb4f6d7e82f45c4dae1da8694 (patch) | |
| tree | 706a423c05f97b435d925fa6614952497c3823e6 | |
| parent | 6c8be6e7b15d787382afcb77f62ef0a82fae1a55 (diff) | |
| download | rabbitmq-server-git-7f9f0d2bc5dcc20eb4f6d7e82f45c4dae1da8694.tar.gz | |
Update rabbitmq.config to advanced.config on windows
| -rw-r--r-- | packaging/windows-exe/rabbitmq_nsi.in | 11 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/packaging/windows-exe/rabbitmq_nsi.in b/packaging/windows-exe/rabbitmq_nsi.in index 3c868b91e7..e02b120c09 100644 --- a/packaging/windows-exe/rabbitmq_nsi.in +++ b/packaging/windows-exe/rabbitmq_nsi.in @@ -135,6 +135,17 @@ Section "RabbitMQ Server (required)" Rabbit ; Set output path to the user's data directory SetOutPath $APPDATA\RabbitMQ + IfFileExists rabbitmq.config 0 +3 + Rename rabbitmq.config advanced.config + Goto config_written + FileOpen $0 advanced.config w + IfErrors config_written + FileWrite $0 "[]." + FileClose $0 + config_written: + + + ; ...And put the example config file there File "rabbitmq_server-%%VERSION%%\etc\rabbitmq.config.example" diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index e1939e214a..236bcea561 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -98,7 +98,7 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then if [ -f "${RABBITMQ_CONFIG_ADVANCED}.config" ]; then RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \ -conf_advanced ${RABBITMQ_CONFIG_ADVANCED} \ - -conf ${RABBITMQ_CONFIG_ADVANCED}" + -config ${RABBITMQ_CONFIG_ADVANCED}" fi fi |