diff --git a/defaults/main.yml b/defaults/main.yml index 4c911be..eb78802 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,13 +1,4 @@ --- -ucs_custom_tls_enabled: False -ucs_custom_tls_apache2_enabled: False -ucs_custom_tls_dovecot_enabled: False -ucs_custom_tls_postfix_enabled: False -ucs_tls_certs_dir: /etc/pki/tls/certs -ucs_tls_key_dir: /etc/pki/tls/private -ucs_tls_cert_path: /etc/pki/tls/certs/mycert.pem -ucs_tls_key_path: /etc/pki/tls/private/mykey.pem - ucs_filesystem_acl: [] # @var ucs_filesystem_acl:example: > # ucs_filesystem_acl: diff --git a/tasks/main.yml b/tasks/main.yml index 70ffdb7..04a6157 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -45,8 +45,3 @@ loop: "{{ ucs_cronjobs }}" loop_control: label: "{{ item.name }}" - -- name: Deploy custom tls certs - ansible.builtin.import_tasks: tls.yml - when: ucs_custom_tls_enabled - tags: tls_renewal diff --git a/tasks/tls.yml b/tasks/tls.yml deleted file mode 100644 index 6a887c6..0000000 --- a/tasks/tls.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- -- name: Create tls folder structure - ansible.builtin.file: - path: "{{ item }}" - state: directory - mode: "0700" - loop: - - "{{ ucs_tls_certs_dir }}" - - "{{ ucs_tls_key_dir }}" - -- name: Copy certs and private key - ansible.builtin.copy: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - mode: "{{ item.mode }}" - loop: - - src: "{{ ucs_tls_cert_path }}" - dest: "{{ ucs_tls_certs_dir }}/ucs.pem" - mode: "0600" - - src: "{{ ucs_tls_key_path }}" - dest: "{{ ucs_tls_key_dir }}/ucs.pem" - mode: "0750" - loop_control: - label: "{{ item.dest }}" - notify: - - __ucs_apache_restart - - __ucs_dovecot_restart - - __ucs_postfix_restart - -- name: Set apache2 ucr vars - xoxys.general.ucr: - path: "{{ item.path }}" - value: "{{ item.value }}" - loop: - - path: apache2/ssl/certificate - value: "{{ ucs_tls_certs_dir }}/ucs.pem" - - path: apache2/ssl/key - value: "{{ ucs_tls_key_dir }}/ucs.pem" - - path: saml/apache2/ssl/certificate - value: "{{ ucs_tls_certs_dir }}/ucs.pem" - - path: saml/apache2/ssl/key - value: "{{ ucs_tls_key_dir }}/ucs.pem" - loop_control: - label: "variable: {{ item.path }}={{ item.value }}" - notify: __ucs_apache_restart - when: ucs_custom_tls_apache2_enabled - -- name: Set dovecot ucr vars - xoxys.general.ucr: - path: "{{ item.path }}" - value: "{{ item.value }}" - loop: - - path: mail/dovecot/ssl/certificate, - value: "{{ ucs_tls_certs_dir }}/ucs.pem" - - path: mail/dovecot/ssl/key - value: "{{ ucs_tls_key_dir }}/ucs.pem" - loop_control: - label: "variable: {{ item.path }}={{ item.value }}" - notify: __ucs_dovecot_restart - when: ucs_custom_tls_dovecot_enabled - -- name: Set postfix ucr vars - xoxys.general.ucr: - path: "{{ item.path }}" - value: "{{ item.value }}" - loop: - - path: mail/postfix/ssl/certificate - value: "{{ ucs_tls_certs_dir }}/ucs.pem" - - path: mail/postfix/ssl/key - value: "{{ ucs_tls_key_dir }}/ucs.pem" - loop_control: - label: "variable: {{ item.path }}={{ item.value }}" - notify: __ucs_postfix_restart - when: ucs_custom_tls_postfix_enabled