Skip to content

Commit 6be795b

Browse files
Fix bug in script
1 parent 99a37b1 commit 6be795b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

bin/deploy-rabbit

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ fi
2323

2424
CONF_DIR=$SCRIPT/../conf/${MODE}
2525
CERTS_DIR=${CONF_DIR}/certs
26+
RABBIT_NETWORK=${RABBIT_NETWORK:-rabbitmq_net}
2627

2728
function generate-final-conf-dir {
2829
FINAL_CONF_DIR=`mktemp -d -t "oauth2"`
@@ -54,9 +55,8 @@ function deploy {
5455
if [[ -f "${CONF_DIR}/requires-tls" ]]; then
5556
EXTRA_PORTS="-p 15671:15671 "
5657
fi
57-
if [[ "${MODE}" == "oauth2-proxy" ]]; then
58-
EXTRA_MOUNTS="${EXTRA_MOUNTS} -v $SCRIPT/../conf/keycloak/certs:/etc/keycloak/certs "
59-
fi
58+
EXTRA_MOUNTS="${EXTRA_MOUNTS} -v $SCRIPT/../conf/${OAUTH_PROVIDER}/certs:/etc/${OAUTH_PROVIDER}/certs "
59+
6060

6161
if [[ -n "${ADVANCED}" && -f "${CONF_DIR}/${ADVANCED}" ]]; then
6262
EXTRA_MOUNTS="${EXTRA_MOUNTS} -v ${CONF_DIR}/${ADVANCED}:/etc/rabbitmq/advanced.config:ro "
@@ -91,5 +91,5 @@ generate-tls-certs-if-required
9191
ensure_docker_network
9292
kill_container_if_exist rabbitmq
9393
deploy
94-
wait_for_message rabbitmq "Starting broker... completed"
94+
wait_for_message rabbitmq "Server startup complete"
9595
print "RabbitMQ is running"

0 commit comments

Comments
 (0)