From 6d75684a408b8002b5bfaa6d8ced3d2cf0413af5 Mon Sep 17 00:00:00 2001 From: nd Date: Sat, 30 Mar 2019 13:42:51 +0100 Subject: [PATCH] no longer enabling ssl on nossl ports... --- templates/vhost.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/vhost.j2 b/templates/vhost.j2 index dfca497..81ec667 100644 --- a/templates/vhost.j2 +++ b/templates/vhost.j2 @@ -1,3 +1,4 @@ +#jinja2:lstrip_blocks: True {% set vhost = item.value %} {% set vhost_name = item.key %} {% set vhost_listen = vhost.listen|default({}) %} @@ -12,8 +13,8 @@ server { listen [::]:{{ vhost_listen.ssl_port|default(443) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %}; {% endif %} {% if vhost_listen.nossl|default(False) %} - listen {{ vhost_listen.nossl_port|default(80) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %}; - listen [::]:{{ vhost_listen.nossl_port|default(80) }} ssl {% if vhost.default_server|default(False) %}default_server{% endif %}; + listen {{ vhost_listen.nossl_port|default(80) }} {% if vhost.default_server|default(False) %}default_server{% endif %}; + listen [::]:{{ vhost_listen.nossl_port|default(80) }} {% if vhost.default_server|default(False) %}default_server{% endif %}; {% endif %} {% for header in vhost.add_headers|default([]) %}