diff --git a/roles/acme/certificate/defaults/main.yml b/roles/acme/certificate/defaults/main.yml index fd503d3..cdb6253 100644 --- a/roles/acme/certificate/defaults/main.yml +++ b/roles/acme/certificate/defaults/main.yml @@ -3,7 +3,7 @@ # domain acme_certificate_prefix: "{{ acme_certificates_directory }}/{{ domain }}" -acme_certificate_location: "{{ acme_certificate_prefix }}.crt" +acme_fullchain_location: "{{ acme_certificate_prefix }}.crt" acme_key_location: "{{ acme_certificate_prefix }}.key" reload_command: "systemctl reload {{ global_nginx_service_name }}" diff --git a/roles/acme/certificate/tasks/main.yml b/roles/acme/certificate/tasks/main.yml index 5864ce8..4b40a8d 100644 --- a/roles/acme/certificate/tasks/main.yml +++ b/roles/acme/certificate/tasks/main.yml @@ -25,7 +25,7 @@ --config-home {{ acme_configuration_directory | quote }} --domain {{ domain | quote }} --key-file {{ acme_key_location | quote }} - --fullchain-file {{ acme_certificate_location | quote }} + --fullchain-file {{ acme_fullchain_location | quote }} --reloadcmd {{ reload_command | quote }} args: chdir: "{{ acme_installation_directory }}" diff --git a/roles/nginx/forward/templates/forward.conf b/roles/nginx/forward/templates/forward.conf index 6c0072f..465c173 100644 --- a/roles/nginx/forward/templates/forward.conf +++ b/roles/nginx/forward/templates/forward.conf @@ -4,7 +4,7 @@ server { server_name {{ domain }}; ssl on; - ssl_certificate {{ acme_certificate_location }}; + ssl_certificate {{ acme_fullchain_location }}; ssl_certificate_key {{ acme_key_location }}; include {{ nginx_snippets_directory }}/https; diff --git a/roles/nginx/mail_proxy/templates/mail_proxy.conf b/roles/nginx/mail_proxy/templates/mail_proxy.conf index 4702d86..6aa6f25 100644 --- a/roles/nginx/mail_proxy/templates/mail_proxy.conf +++ b/roles/nginx/mail_proxy/templates/mail_proxy.conf @@ -8,7 +8,7 @@ server { proxy_pass_error_message on; starttls on; - ssl_certificate {{ acme_certificate_location }}; + ssl_certificate {{ acme_fullchain_location }}; ssl_certificate_key {{ acme_key_location }}; include {{ nginx_snippets_directory }}/ssl; diff --git a/roles/nginx/php/templates/server.conf b/roles/nginx/php/templates/server.conf index e5c5ff2..d542ecf 100644 --- a/roles/nginx/php/templates/server.conf +++ b/roles/nginx/php/templates/server.conf @@ -4,7 +4,7 @@ server { server_name {{ domain }}; ssl on; - ssl_certificate {{ acme_certificate_location }}; + ssl_certificate {{ acme_fullchain_location }}; ssl_certificate_key {{ acme_key_location }}; include {{ nginx_snippets_directory }}/https; diff --git a/roles/nginx/server/defaults/main.yml b/roles/nginx/server/defaults/main.yml index 15fbfaa..27ef33e 100644 --- a/roles/nginx/server/defaults/main.yml +++ b/roles/nginx/server/defaults/main.yml @@ -11,5 +11,5 @@ server_name_directives: | server_name {{ domain }}; certificates_directives: | - ssl_certificate {{ acme_certificate_location }}; + ssl_certificate {{ acme_fullchain_location }}; ssl_certificate_key {{ acme_key_location }}; diff --git a/roles/nginx/static/templates/static.conf b/roles/nginx/static/templates/static.conf index b431d56..ec89685 100644 --- a/roles/nginx/static/templates/static.conf +++ b/roles/nginx/static/templates/static.conf @@ -4,7 +4,7 @@ server { server_name {{ domain }}; ssl on; - ssl_certificate {{ acme_certificate_location }}; + ssl_certificate {{ acme_fullchain_location }}; ssl_certificate_key {{ acme_key_location }}; index index.html index.htm;