Skip to content

Commit d2db434

Browse files
Reduce mounts on rabbitmq docker image
And clean up rabbitmq.tls.conf
1 parent 5e5aa3b commit d2db434

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

selenium/bin/components/rabbitmq

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ start_docker_rabbitmq() {
182182
-p 15672:15672 \
183183
-p 15671:15671 \
184184
-v $CONF_DIR/rabbitmq/:/etc/rabbitmq \
185-
-v $CONF_DIR/rabbitmq/:/var/rabbitmq \
185+
-v $CONF_DIR/rabbitmq/imports:/var/rabbitmq/imports \
186186
${RABBITMQ_DOCKER_IMAGE}
187187
#-v ${TEST_DIR}:/config \
188188

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11

2-
mqtt.ssl_cert_login = true
32
ssl_cert_login_from = subject_alternative_name
43
ssl_cert_login_san_type = dns
54
ssl_cert_login_san_index = 1
5+
ssl_options.verify = verify_peer
6+
ssl_options.fail_if_no_peer_cert = true
7+
8+
mqtt.ssl_cert_login = true
69
mqtt.ssl_cert_client_id_from = subject_alternative_name
710
mqtt.ssl_cert_login_san_type = dns
811
mqtt.ssl_cert_login_san_index = 1

selenium/test/authnz-msg-protocols/rabbitmq.tls.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
listeners.ssl.1 = 5671
33

44
ssl_options.cacertfile = ${RABBITMQ_CERTS}/ca_rabbitmq_certificate.pem
5-
ssl_options.certfile = ${RABBITMQ_CERTS}/server_rabbitmq_certificate.pem
6-
ssl_options.keyfile = ${RABBITMQ_CERTS}/server_rabbitmq_key.pem
7-
ssl_options.verify = verify_peer
5+
ssl_options.certfile = ${RABBITMQ_CERTS}/server_rabbitmq_certificate.pem
6+
ssl_options.keyfile = ${RABBITMQ_CERTS}/server_rabbitmq_key.pem
7+
ssl_options.verify = verify_peer
88
ssl_options.fail_if_no_peer_cert = true
99

1010
management.ssl.port = 15671
1111
management.ssl.cacertfile = ${RABBITMQ_CERTS}/ca_rabbitmq_certificate.pem
12-
management.ssl.certfile = ${RABBITMQ_CERTS}/server_rabbitmq_certificate.pem
13-
management.ssl.keyfile = ${RABBITMQ_CERTS}/server_rabbitmq_key.pem
12+
management.ssl.certfile = ${RABBITMQ_CERTS}/server_rabbitmq_certificate.pem
13+
management.ssl.keyfile = ${RABBITMQ_CERTS}/server_rabbitmq_key.pem
1414

15-
mqtt.listeners.ssl.default = 8883
15+
mqtt.listeners.ssl.default = 8883

0 commit comments

Comments
 (0)