From 1153fffc169c2375b17946f738c3a140e4f2423a Mon Sep 17 00:00:00 2001 From: thiuda Date: Sun, 8 May 2022 19:38:40 +0200 Subject: [PATCH 1/2] (refactor) rm get_tld --- templates/reverse_proxy.conf.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/reverse_proxy.conf.j2 b/templates/reverse_proxy.conf.j2 index c1ee891..2b99448 100644 --- a/templates/reverse_proxy.conf.j2 +++ b/templates/reverse_proxy.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +# {{ ansible_managed } # commit: {{ lookup('pipe', 'git rev-parse --short HEAD') }} server { @@ -17,10 +17,10 @@ server { ssl_prefer_server_ciphers on; ssl_dhparam {{ ssl_dir }}/dhparams.pem; ssl_ecdh_curve secp384r1; - ssl_certificate {{ certs_dir }}/{{ domain | get_tld }}/cert.pem; - ssl_certificate_key {{ certs_dir }}/{{ domain | get_tld }}/key.pem; - ssl_certificate {{ certs_dir }}/{{ domain | get_tld }}/cert.pem; - ssl_certificate_key {{ certs_dir }}/{{ domain | get_tld }}/key.pem; + ssl_certificate {{ certs_dir }}/{{ domain | get_cert_domain }}/cert.pem; + ssl_certificate_key {{ certs_dir }}/{{ domain | get_cert_domain }}/key.pem; + ssl_certificate {{ certs_dir }}/{{ domain | get_cert_domain }}/cert.pem; + ssl_certificate_key {{ certs_dir }}/{{ domain | get_cert_domain }}/key.pem; ## # OCSP Stapling @@ -28,7 +28,7 @@ server { ssl_stapling on; ssl_stapling_verify on; resolver {{ dns_resolvers }} valid=300s; - ssl_trusted_certificate {{ certs_dir }}/{{ domain | get_tld }}/cert.pem; + ssl_trusted_certificate {{ certs_dir }}/{{ domain | get_cert_domain }}/cert.pem; location / { proxy_set_header Host $http_host; -- 2.40.1 From 824ec7aed4596bf50b33f4d8d47e450aa802177a Mon Sep 17 00:00:00 2001 From: thiuda Date: Sun, 8 May 2022 19:40:45 +0200 Subject: [PATCH 2/2] (fix) type --- templates/reverse_proxy.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/reverse_proxy.conf.j2 b/templates/reverse_proxy.conf.j2 index 2b99448..8a073dc 100644 --- a/templates/reverse_proxy.conf.j2 +++ b/templates/reverse_proxy.conf.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed } +# {{ ansible_managed }} # commit: {{ lookup('pipe', 'git rev-parse --short HEAD') }} server { -- 2.40.1