Skip to content

Commit 3569ec7

Browse files
committed
Fix the level at which we inject the "rabbitmq_management" configuration
Fixes #96
1 parent 87da33f commit 3569ec7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

docker-entrypoint.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ rabbit_array() {
129129
}
130130

131131
if [ "$1" = 'rabbitmq-server' ] && [ "$haveConfig" ]; then
132+
fullConfig=()
133+
132134
rabbitConfig=(
133135
"{ loopback_users, $(rabbit_array) }"
134136
)
@@ -199,6 +201,8 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$haveConfig" ]; then
199201
rabbitConfig+=( "{ $conf, $rawVal }" )
200202
done
201203

204+
fullConfig+=( "{ rabbit, $(rabbit_array "${rabbitConfig[@]}") }" )
205+
202206
# If management plugin is installed, then generate config consider this
203207
if [ "$(rabbitmq-plugins list -m -e rabbitmq_management)" ]; then
204208
rabbitManagementListenerConfig=()
@@ -214,12 +218,13 @@ if [ "$1" = 'rabbitmq-server' ] && [ "$haveConfig" ]; then
214218
'{ ssl, false }'
215219
)
216220
fi
217-
rabbitConfig+=(
221+
222+
fullConfig+=(
218223
"{ rabbitmq_management, $(rabbit_array "{ listener, $(rabbit_array "${rabbitManagementListenerConfig[@]}") }") }"
219224
)
220225
fi
221226

222-
echo "$(rabbit_array "{ rabbit, $(rabbit_array "${rabbitConfig[@]}") }")." > /etc/rabbitmq/rabbitmq.config
227+
echo "$(rabbit_array "${fullConfig[@]}")." > /etc/rabbitmq/rabbitmq.config
223228
fi
224229

225230
combinedSsl='/tmp/combined.pem'

0 commit comments

Comments
 (0)