Skip to content

Commit 9edb581

Browse files
Fix location of rabbitmq certs
1 parent 5ac039b commit 9edb581

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export IMPORT_DIR=/var/rabbitmq/imports
2+
export RABBITMQ_CERTS=/etc/rabbitmq/certs
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
export IMPORT_DIR=selenium/test/authnz-msg-protocols/imports
2+
export RABBITMQ_CERTS=selenium/test/authnz-msg-protocols/certs

selenium/test/authnz-msg-protocols/mqtt.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ describe('Having MQTT protocol enbled and the following auth_backends: ' + backe
1515
let mqttOptions
1616
let expectations = []
1717
let rabbit = process.env.RABBITMQ_HOSTNAME || 'localhost'
18+
let mqttUrl = process.env.RABBITMQ_MQTT_URL || "mqtt://" + rabbit + ":1883"
1819
let username = process.env.RABBITMQ_AMQP_USERNAME
1920
let password = process.env.RABBITMQ_AMQP_PASSWORD
2021
let client_id = process.env.RABBITMQ_AMQP_CLIENT_ID || 'selenium-client'
22+
23+
console.log("RABBITMQ_TEST_DIR : " + process.env.RABBITMQ_TEST_DIR)
2124

2225
before(function () {
2326
if (backends.includes("http") && username.includes("http")) {
@@ -41,12 +44,12 @@ describe('Having MQTT protocol enbled and the following auth_backends: ' + backe
4144
clean: false,
4245
reconnectPeriod: '1000',
4346
username: username,
44-
password: password,
47+
password: password
4548
}
4649
})
4750

4851
it('can open an MQTT connection', function () {
49-
var client = mqtt.connect("mqtt://" + rabbit + ":1883", mqttOptions)
52+
var client = mqtt.connect(mqttUrl, mqttOptions)
5053
client.on('error', function(err) {
5154
assert.fail("Mqtt connection failed due to " + err)
5255
client.end()
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
listeners.ssl.1 = 5671
33

4-
ssl_options.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_rabbitmq_certificate.pem
5-
ssl_options.certfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_certificate.pem
6-
ssl_options.keyfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_key.pem
4+
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
77
ssl_options.verify = verify_peer
88
ssl_options.fail_if_no_peer_cert = true
99

1010
management.ssl.port = 15671
11-
management.ssl.cacertfile = ${RABBITMQ_TEST_DIR}/certs/ca_rabbitmq_certificate.pem
12-
management.ssl.certfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_certificate.pem
13-
management.ssl.keyfile = ${RABBITMQ_TEST_DIR}/certs/server_rabbitmq_key.pem
11+
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

0 commit comments

Comments
 (0)