From 101e23ca07e86149327673182383e11a01f0c367 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 31 Jul 2019 00:11:31 +0200 Subject: [PATCH] fix issue with php tpl --- src/templates/vhost-http.twig | 6 ++---- src/templates/vhost-https.twig | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/templates/vhost-http.twig b/src/templates/vhost-http.twig index a2d1e95..7fe7c37 100644 --- a/src/templates/vhost-http.twig +++ b/src/templates/vhost-http.twig @@ -9,10 +9,8 @@ SuexecUserGroup {{ SYSTEM_USER_USERNAME }} {{ SYSTEM_USER_GROUP }} ErrorLog /services/web/logs/{{ DOMAIN }}.log CustomLog /services/web/logs/{{ DOMAIN }}.log combined -{% if WEB_HTTPS_FORCE == "yes" %} - - Redirect permanent / https://{{ DOMAIN }}/ -{% endif %} +{% block force_https %}{% if WEB_HTTPS_FORCE == "yes" %} + Redirect permanent / https://{{ DOMAIN }}/{% endif %}{% endblock %} Options -Indexes +FollowSymLinks +MultiViews diff --git a/src/templates/vhost-https.twig b/src/templates/vhost-https.twig index a1f92d3..80e915b 100644 --- a/src/templates/vhost-https.twig +++ b/src/templates/vhost-https.twig @@ -21,3 +21,5 @@ BrowserMatch "MSIE [2-6]" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown {% endblock extra %} + +{% block force_https %}{% endblock %}