Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

[mailman3] Use the correct mailman certificate

Browse source 
Signed-off-by: Michal Konecny <mkonecny@redhat.com>
This commit is contained in:
Michal Konecny 2024-07-02 10:28:17 +02:00
parent 05078de742
commit 24eb9a4eda
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
roles/mailman3/tasks/main.yml
View file

@ -80,14 +80,14 @@
mode: "{{item.mode}}" mode: "{{item.mode}}"
when: env == 'staging' when: env == 'staging'
with_items: with_items:
- src: "{{private}}/files/rabbitmq/staging/pki/issued/mailman3-fedmsg-plugin.stg.crt" - src: "{{private}}/files/rabbitmq/staging/pki/issued/mailman.stg.crt"
dest: mailman3-fedmsg-plugin.crt dest: mailman.crt
mode: "444" mode: "444"
- src: "{{private}}/files/rabbitmq/staging/pki/private/mailman3-fedmsg-plugin.stg.key" - src: "{{private}}/files/rabbitmq/staging/pki/private/mailman.stg.key"
dest: mailman3-fedmsg-plugin.key dest: mailman.key
mode: "440" mode: "440"
- src: "{{private}}/files/rabbitmq/staging/pki/ca.crt" - src: "{{private}}/files/rabbitmq/staging/pki/ca.crt"
dest: mailman3-fedmsg-plugin.ca dest: mailman.ca
mode: "444" mode: "444"
tags: tags:
- mailman - mailman
@ -102,14 +102,14 @@
mode: "{{item.mode}}" mode: "{{item.mode}}"
when: env != 'staging' when: env != 'staging'
with_items: with_items:
- src: "{{private}}/files/rabbitmq/production/pki/issued/mailman3-fedmsg-plugin.crt" - src: "{{private}}/files/rabbitmq/production/pki/issued/mailman.crt"
dest: mailman3-fedmsg-plugin.crt dest: mailman.crt
mode: "444" mode: "444"
- src: "{{private}}/files/rabbitmq/production/pki/private/mailman3-fedmsg-plugin.key" - src: "{{private}}/files/rabbitmq/production/pki/private/mailman.key"
dest: mailman3-fedmsg-plugin.key dest: mailman.key
mode: "440" mode: "440"
- src: "{{private}}/files/rabbitmq/production/pki/ca.crt" - src: "{{private}}/files/rabbitmq/production/pki/ca.crt"
dest: mailman3-fedmsg-plugin.ca dest: mailman.ca
mode: "444" mode: "444"
tags: tags:
- mailman - mailman

6
roles/mailman3/templates/fedmsg-plugin.toml.j2
View file

@ -9,9 +9,9 @@ topic_prefix = "org.fedoraproject.prod"
{% endif %} {% endif %}
[tls] [tls]
ca_cert = "/etc/pki/rabbitmq/mailman/mailman3-fedmsg-plugin.ca" ca_cert = "/etc/pki/rabbitmq/mailman/mailman.ca"
keyfile = "/etc/pki/rabbitmq/mailman/mailman3-fedmsg-plugin.key" keyfile = "/etc/pki/rabbitmq/mailman/mailman.key"
certfile = "/etc/pki/rabbitmq/mailman/mailman3-fedmsg-plugin.crt" certfile = "/etc/pki/rabbitmq/mailman/mailman.crt"
[client_properties] [client_properties]
app = "Mailman3" app = "Mailman3"