From 81417068c24dc3575deb9fff7818dafcb8be8f0d Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 31 Jan 2021 15:38:18 -0600 Subject: [PATCH] roles/synapse: Add cert role dependency The *cert* role must be defined as a role dependency now, so that the role can define a handler to "listen" for the "certificate changed" event. This change happened on *master*, before the *matrix* branch was merged. --- roles/synapse/handlers/main.yml | 1 + roles/synapse/meta/main.yml | 9 +++++++++ synapse.yml | 7 ------- 3 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 roles/synapse/meta/main.yml diff --git a/roles/synapse/handlers/main.yml b/roles/synapse/handlers/main.yml index 7a14c35..2bb3edc 100644 --- a/roles/synapse/handlers/main.yml +++ b/roles/synapse/handlers/main.yml @@ -1,4 +1,5 @@ - name: restart synapse + listen: certificate changed service: name: synapse state: restarted diff --git a/roles/synapse/meta/main.yml b/roles/synapse/meta/main.yml new file mode 100644 index 0000000..0b72f2d --- /dev/null +++ b/roles/synapse/meta/main.yml @@ -0,0 +1,9 @@ +dependencies: +- role: cert + vars: + cert_src: '{{ matrix_tls_cert }}' + cert_dest: /etc/pki/tls/certs/{{ matrix_tls_cert|basename }} + cert_key_src: '{{ matrix_tls_key }}' + cert_key_dest: /etc/pki/tls/private/{{ matrix_tls_key|basename }} + when: matrix_tls_cert is defined + tags: synapse diff --git a/synapse.yml b/synapse.yml index bcd1691..8ce42af 100644 --- a/synapse.yml +++ b/synapse.yml @@ -2,13 +2,6 @@ vars_files: - vault/synapse/{{ matrix_server_name }} roles: - - role: cert - cert_src: '{{ matrix_tls_cert }}' - cert_dest: /etc/pki/tls/certs/{{ matrix_tls_cert|basename }} - cert_key_src: '{{ matrix_tls_key }}' - cert_key_dest: /etc/pki/tls/private/{{ matrix_tls_key|basename }} - when: matrix_tls_cert is defined - tags: cert - apache - synapse tasks: