Skip to content

Commit 01afd69

Browse files
committed
fully drop database_ssl boolean again
1 parent 5b6e802 commit 01afd69

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

development/playbooks/remote-database/metadata.obsah.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

development/playbooks/remote-database/remote-database.yaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,11 @@
99
certificates_hostnames:
1010
- "{{ ansible_facts['fqdn'] }}"
1111
certificates_ca_password: "CHANGEME"
12-
database_ssl: true
13-
database_ssl_crt: "{{ certificates_ca_directory }}/certs/{{ ansible_facts['fqdn'] }}.crt"
14-
database_ssl_key: "{{ certificates_ca_directory }}/private/{{ ansible_facts['fqdn'] }}.key"
15-
postgresql_ssl_crt: "{{ database_ssl_crt if database_ssl else '' }}"
16-
postgresql_ssl_key: "{{ database_ssl_key if database_ssl else '' }}"
12+
postgresql_ssl_crt: "{{ certificates_ca_directory }}/certs/{{ ansible_facts['fqdn'] }}.crt"
13+
postgresql_ssl_key: "{{ certificates_ca_directory }}/private/{{ ansible_facts['fqdn'] }}.key"
1714
roles:
1815
- role: pre_install
1916
- role: certificates
20-
when:
21-
- database_ssl
2217
- role: postgresql
2318

2419
tasks:
@@ -27,5 +22,3 @@
2722
src: "{{ certificates_ca_directory }}/certs/ca.crt"
2823
dest: "{{ obsah_state_path }}/db-ca.crt"
2924
flat: true
30-
when:
31-
- database_ssl

0 commit comments

Comments
 (0)