diff --git a/ansible/roles/element-and-nginx/templates/conf.j2 b/ansible/roles/element-and-nginx/templates/conf.j2 index bbbad4e..312df8b 100644 --- a/ansible/roles/element-and-nginx/templates/conf.j2 +++ b/ansible/roles/element-and-nginx/templates/conf.j2 @@ -6,7 +6,7 @@ server { server_name {{var_element_and_nginx_domain}}; - ssl_certificate /etc/ssl/certs/{{var_element_and_nginx_domain}}.pem; + ssl_certificate /etc/ssl/fullchains/{{var_element_and_nginx_domain}}.pem; ssl_certificate_key /etc/ssl/private/{{var_element_and_nginx_domain}}.pem; root {{var_element_and_nginx_path}}; diff --git a/ansible/roles/synapse-and-nginx/templates/conf.j2 b/ansible/roles/synapse-and-nginx/templates/conf.j2 index 74c13bd..b9b94c6 100644 --- a/ansible/roles/synapse-and-nginx/templates/conf.j2 +++ b/ansible/roles/synapse-and-nginx/templates/conf.j2 @@ -10,7 +10,7 @@ server { server_name {{var_synapse_and_nginx_domain}}; - ssl_certificate /etc/ssl/certs/{{var_synapse_and_nginx_domain}}.pem; + ssl_certificate /etc/ssl/fullchains/{{var_synapse_and_nginx_domain}}.pem; ssl_certificate_key /etc/ssl/private/{{var_synapse_and_nginx_domain}}.pem; location ~ ^(/_matrix|/_synapse/client) { diff --git a/ansible/roles/tlscert_existing/defaults/main.json b/ansible/roles/tlscert_existing/defaults/main.json index 0a042c4..66473bb 100644 --- a/ansible/roles/tlscert_existing/defaults/main.json +++ b/ansible/roles/tlscert_existing/defaults/main.json @@ -1,6 +1,7 @@ { "var_tlscert_existing_key_path": "/tmp/key.pem", "var_tlscert_existing_cert_path": "/tmp/cert.pem", + "var_tlscert_existing_fullchain_path": "/tmp/fullchain.pem", "var_tlscert_existing_domain_base": "example.org", "var_tlscert_existing_domain_path": "foo", "var_tlscert_existing_ssl_directory": "/etc/ssl" diff --git a/ansible/roles/tlscert_existing/tasks/main.json b/ansible/roles/tlscert_existing/tasks/main.json index 63e9895..28ebd49 100644 --- a/ansible/roles/tlscert_existing/tasks/main.json +++ b/ansible/roles/tlscert_existing/tasks/main.json @@ -28,5 +28,22 @@ "src": "{{var_tlscert_existing_cert_path}}", "dest": "{{var_tlscert_existing_ssl_directory}}/certs/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" } + }, + { + "name": "fullchain | insert", + "when": "var_tlscert_existing_fullchain_path != None", + "become": true, + "ansible.builtin.copy": { + "src": "{{var_tlscert_existing_fullchain_path}}", + "dest": "{{var_tlscert_existing_ssl_directory}}/fullchains/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" + } + }, + { + "name": "fullchain | compose", + "when": "var_tlscert_existing_fullchain_path == None", + "become": true, + "ansible.builtin.shell": { + "cmd": "cat {{var_tlscert_existing_ssl_directory}}/certs/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem > {{var_tlscert_existing_ssl_directory}}/fullchains/{{var_tlscert_existing_domain_path}}.{{var_tlscert_existing_domain_base}}.pem" + } } ]