diff --git a/defaults/main/1_main.yml b/defaults/main/1_main.yml index 6f41ddf..b4507da 100644 --- a/defaults/main/1_main.yml +++ b/defaults/main/1_main.yml @@ -85,14 +85,6 @@ defaults_certs: locality: email: -CERT_CONFIG: "{{ defaults_certs | combine(certs, recursive=true) }}" - -default_le_certbot_cert: - domains: [] - key_size: "{{ CERT_CONFIG.letsencrypt.key_size | default(CERT_CONFIG.cert.key_size, true) }}" - state: "{{ CERT_CONFIG.letsencrypt.state | default('present', true) }}" - email: "{{ CERT_CONFIG.letsencrypt.email }}" - # letsencrypt example: # certs: # example1: diff --git a/defaults/main/9_merge.yml b/defaults/main/9_merge.yml new file mode 100644 index 0000000..9760de0 --- /dev/null +++ b/defaults/main/9_merge.yml @@ -0,0 +1,9 @@ +--- + +CERT_CONFIG: "{{ defaults_certs | combine(certs, recursive=true) }}" + +default_le_certbot_cert: + domains: [] + key_size: "{{ CERT_CONFIG.letsencrypt.key_size | default(CERT_CONFIG.cert.key_size, true) }}" + state: "{{ CERT_CONFIG.letsencrypt.state | default('present', true) }}" + email: "{{ CERT_CONFIG.letsencrypt.email }}"