From b4239da6ae3d96c09e04428c0d01dc31f80e3d71 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 3 Oct 2016 18:44:18 +0200 Subject: [PATCH] library/roles/nginx/templates/nginx-server-ssl.conf.j2: Fix the behaviour when letsencrypt is not installed. --- nginx/templates/nginx-server-ssl.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx/templates/nginx-server-ssl.conf.j2 b/nginx/templates/nginx-server-ssl.conf.j2 index 90a70fa7..aeeb1c1b 100644 --- a/nginx/templates/nginx-server-ssl.conf.j2 +++ b/nginx/templates/nginx-server-ssl.conf.j2 @@ -1,6 +1,6 @@ -{% if letsencrypt_acme_install %} -ssl_certificate {{ letsencrypt_acme_certs_dir }}/fullchain; -ssl_certificate_key {{ letsencrypt_acme_certs_dir }}/privkey; +{% if letsencrypt_acme_install is defined and letsencrypt_acme_install %} +ssl_certificate {{ letsencrypt_acme_certs_dir | default('/var/lib/acme/live/{{ ansible_fqdn }}') }}/fullchain; +ssl_certificate_key {{ letsencrypt_acme_certs_dir | default('/var/lib/acme/live/{{ ansible_fqdn }}') }}/privkey; {% endif %} ssl_session_cache shared:SSL:10m; ssl_session_timeout 10m;