docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use consistent variable naming and adjust configuration written to include "load_definitions" in the proper place

This commit is contained in:
Tianon Gravi 2017-01-09 11:49:51 -08:00
parent d72594a539
commit 3ba4ec4db3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docker-entrypoint.sh
View File

@ -235,8 +235,11 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$haveConfig" ]; then
fullConfig+=( "{ rabbit, $(rabbit_array "${rabbitConfig[@]}") }" ) fullConfig+=( "{ rabbit, $(rabbit_array "${rabbitConfig[@]}") }" )
# If management plugin is installed, then generate config consider this # if management plugin is installed, generate config for it
# https://www.rabbitmq.com/management.html#configuration
if [ "$(rabbitmq-plugins list -m -e rabbitmq_management)" ]; then if [ "$(rabbitmq-plugins list -m -e rabbitmq_management)" ]; then
rabbitManagementConfig=()
if [ "$haveManagementSslConfig" ]; then if [ "$haveManagementSslConfig" ]; then
IFS=$'\n' IFS=$'\n'
rabbitManagementSslOptions=( $(rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}") ) rabbitManagementSslOptions=( $(rabbit_env_config 'management_ssl' "${sslConfigKeys[@]}") )
@ -253,17 +256,22 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$haveConfig" ]; then
'{ ssl, false }' '{ ssl, false }'
) )
fi fi
rabbitManagementConfig+=(
"{ listener, $(rabbit_array "${rabbitManagementListenerConfig[@]}") }"
)
# If definitions file exists, then load it # if definitions file exists, then load it
definitions_file=/etc/rabbitmq/definitions.json # https://www.rabbitmq.com/management.html#load-definitions
if [ -f "${definitions_file}" ]; then managementDefinitionsFile='/etc/rabbitmq/definitions.json'
fullConfig+=( if [ -f "${managementDefinitionsFile}" ]; then
"{ rabbitmq_management, $(rabbit_array "{ listener, $(rabbit_array "${rabbitManagementListenerConfig[@]}") }, { load_definitions, \"${definitions_file}\" }") }" # see also https://github.com/docker-library/rabbitmq/pull/112#issuecomment-271485550
rabbitManagementConfig+=(
"{ load_definitions, \"$managementDefinitionsFile\" }"
) )
fi fi
fullConfig+=( fullConfig+=(
"{ rabbitmq_management, $(rabbit_array "{ listener, $(rabbit_array "${rabbitManagementListenerConfig[@]}") }") }" "{ rabbitmq_management, $(rabbit_array "${rabbitManagementConfig[@]}") }"
) )
fi fi