Skip to content

Commit 4b0076d

Browse files
committed
Rename TLS files
1 parent 0c80a6e commit 4b0076d

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

ci/cluster/configuration/rabbitmq.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ loopback_users = none
77
listeners.ssl.default = 5671
88

99
ssl_options.cacertfile = /etc/rabbitmq/tls/ca_certificate.pem
10-
ssl_options.certfile = /etc/rabbitmq/tls/server_acogoluegnes-nuc_certificate.pem
11-
ssl_options.keyfile = /etc/rabbitmq/tls/server_acogoluegnes-nuc_key.pem
10+
ssl_options.certfile = /etc/rabbitmq/tls/server_certificate.pem
11+
ssl_options.keyfile = /etc/rabbitmq/tls/server_key.pem
1212
ssl_options.verify = verify_peer
1313
ssl_options.fail_if_no_peer_cert = false
1414
ssl_options.honor_cipher_order = true

ci/cluster/docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ services:
1414
tty: true
1515
volumes:
1616
- ./configuration/:/etc/rabbitmq/
17+
- ../../rabbitmq-configuration/tls:/etc/rabbitmq/tls/
1718
node1:
1819
environment:
1920
- RABBITMQ_ERLANG_COOKIE='secret_cookie'
@@ -28,6 +29,7 @@ services:
2829
tty: true
2930
volumes:
3031
- ./configuration/:/etc/rabbitmq/
32+
- ../../rabbitmq-configuration/tls:/etc/rabbitmq/tls/
3133
node2:
3234
environment:
3335
- RABBITMQ_ERLANG_COOKIE='secret_cookie'
@@ -42,5 +44,6 @@ services:
4244
tty: true
4345
volumes:
4446
- ./configuration/:/etc/rabbitmq/
47+
- ../../rabbitmq-configuration/tls:/etc/rabbitmq/tls/
4548
networks:
4649
rabbitmq-cluster:

ci/start-cluster.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@ mkdir -p rabbitmq-configuration/tls
1515

1616
make -C "${PWD}"/tls-gen/basic
1717

18-
rm -rf ci/cluster/configuration/tls
19-
mkdir -p ci/cluster/configuration/tls
20-
cp -R "${PWD}"/tls-gen/basic/result/* ci/cluster/configuration/tls
21-
chmod o+r ci/cluster/configuration/tls/*
22-
chmod g+r ci/cluster/configuration/tls/*
18+
rm -rf rabbitmq-configuration
19+
mkdir -p rabbitmq-configuration/tls
20+
cp -R "${PWD}"/tls-gen/basic/result/* rabbitmq-configuration/tls
21+
mv rabbitmq-configuration/tls/server_$(hostname)_certificate.pem rabbitmq-configuration/tls/server_certificate.pem
22+
mv rabbitmq-configuration/tls/server_$(hostname)_key.pem rabbitmq-configuration/tls/server_key.pem
23+
chmod o+r rabbitmq-configuration/tls/*
24+
chmod g+r rabbitmq-configuration/tls/*
2325

2426
ls -al ci/cluster/configuration/tls/
2527

2628
docker compose --file ci/cluster/docker-compose.yml down
27-
docker compose --file ci/cluster/docker-compose.yml up
29+
docker compose --file ci/cluster/docker-compose.yml up --detach
2830

2931
wait_for_message rabbitmq0 "completed with"
3032

0 commit comments

Comments
 (0)