diff --git a/automation/roles/tls_certificate/copy/tasks/main.yml b/automation/roles/tls_certificate/copy/tasks/main.yml index fe8c05448..3fad3ac28 100644 --- a/automation/roles/tls_certificate/copy/tasks/main.yml +++ b/automation/roles/tls_certificate/copy/tasks/main.yml @@ -43,11 +43,4 @@ - { index: 0, path: "{{ tls_privatekey_path | default('/etc/tls/server.key') }}", mode: "0400" } - { index: 1, path: "{{ tls_cert_path | default('/etc/tls/server.crt') }}", mode: "0644" } - { index: 2, path: "{{ tls_ca_cert_path | default('/etc/tls/ca.crt') }}", mode: "0644" } - - - name: Delete TLS certificate and key from the ansible controller - ansible.builtin.file: - path: "files/tls/" - state: absent - delegate_to: localhost - run_once: true when: copy_for == 'pg' diff --git a/automation/vars/main.yml b/automation/vars/main.yml index 4e4aa3ef5..f66b447e4 100644 --- a/automation/vars/main.yml +++ b/automation/vars/main.yml @@ -344,7 +344,7 @@ postgresql_pg_hba: - { type: "local", database: "all", user: "all", address: "", method: "{{ postgresql_password_encryption_algorithm }}" } - { type: "host", database: "all", user: "all", address: "127.0.0.1/32", method: "{{ postgresql_password_encryption_algorithm }}" } - { type: "host", database: "all", user: "all", address: "::1/128", method: "{{ postgresql_password_encryption_algorithm }}" } - - type: > + - type: >- {% if tls_cert_generate | bool %}hostssl {% else %}host {% endif %} @@ -353,7 +353,7 @@ postgresql_pg_hba: address: "0.0.0.0/0" method: "{{ postgresql_password_encryption_algorithm }}" -# - type: > +# - type: >- # {% if tls_cert_generate | bool %}hostssl # {% else %}host # {% endif %} @@ -362,7 +362,7 @@ postgresql_pg_hba: # address: "192.168.0.0/24" # method: "{{ postgresql_password_encryption_algorithm }}" -# - type: > +# - type: >- # {% if tls_cert_generate | bool %}hostssl # {% else %}host # {% endif %}