diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index 8ed5982..16dbff2 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -39,7 +39,7 @@ server { {% endif %} } } - +{%+ if notls is not defined %} server { {% if nginx_listen443 is defined %} {{ nginx_listen443 }} @@ -65,9 +65,12 @@ server { {% if ssl_certificate is defined -%} {{ ssl_certificate | indent(4) }} - {% else -%} + {% elif instance_name is defined -%} ssl_certificate /etc/ssl/csr/{{ instance_name }}-fullchain.crt; ssl_certificate_key /etc/ssl/private/{{ instance_name }}.pem; + {% else -%} + ssl_certificate /etc/ssl/csr/{{ domains[0] }}-fullchain.crt; + ssl_certificate_key /etc/ssl/private/{{ domains[0] }}.pem; {% endif %} add_header X-XSS-Protection "0"; @@ -104,6 +107,9 @@ server { {% if ssl_certificate is defined %} {{ ssl_certificate }} + {% elif instance_name is defined -%} +ssl_certificate /etc/ssl/csr/{{ instance_name }}-fullchain.crt; + ssl_certificate_key /etc/ssl/private/{{ instance_name }}.pem; {% else %} ssl_certificate /etc/ssl/csr/{{ instance_name }}-fullchain.crt; ssl_certificate_key /etc/ssl/private/{{ instance_name }}.pem; @@ -117,6 +123,7 @@ ssl_certificate /etc/ssl/csr/{{ instance_name }}-fullchain.crt; } } {% endif %} +{% endif %} {% if after_server is defined %} {{ after_server }} {% endif %}