From cc2f7a5cb3e867b9849ccc28899c6e308ab03fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 25 Mar 2020 17:27:04 +0100 Subject: [PATCH] retrace: add again fedora-messaging configs this has been added in 4d1bcd18025cafc1a6061874d8db7ccd2fa52de0 but later lost when rebased to latest upstream role --- playbooks/groups/retrace.yml | 3 +++ roles/abrt/faf-pre/tasks/main.yml | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 2dfa6d0df6..50e3db96d7 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -119,5 +119,8 @@ rs_faf_link_dir: /srv/retrace/hardlink-local hostname: retrace.fedoraproject.org faf_spool_dir: /srv/faf + faf_fedmsg_ca_cert: /etc/fedora-messaging/faf/ca.crt + faf_fedmsg_keyfile: /etc/fedora-messaging/faf/faf.key + faf_fedmsg_certfile: /etc/fedora-messaging/faf/faf.crt when: datacenter == "aws" - import_role: name=abrt/retrace-post diff --git a/roles/abrt/faf-pre/tasks/main.yml b/roles/abrt/faf-pre/tasks/main.yml index 4dad91f703..dc7a917e6e 100644 --- a/roles/abrt/faf-pre/tasks/main.yml +++ b/roles/abrt/faf-pre/tasks/main.yml @@ -17,6 +17,30 @@ owner: faf group: faf +- name: create folders where we place certs for fedora-messaging + file: path=/etc/fedora-messaging/faf owner=root group=root mode=0755 state=directory + +- name: install certs for fedora-messaging + copy: src={{ item.src }} + dest=/etc/fedora-messaging/faf/{{ item.dest }} + owner={{ item.owner }} group=root mode={{ item.mode }} + loop: + - { src: "{{private}}/files/rabbitmq/{{env}}/pki/ca.crt", + dest: "ca.crt", + owner: faf, + mode: 0644 + } + - { src: "{{private}}/files/rabbitmq/{{env}}/pki/private/faf.key", + dest: "faf.key", + owner: faf, + mode: "600" + } + - { src: "{{private}}/files/rabbitmq/{{env}}/pki/issued/faf.crt", + dest: "faf.crt", + owner: faf, + mode: 0644 + } + # landing page - name: install abrt-server-info-page package: