Browse Source

fix issue with twig

master
Simon Vieille 3 months ago
parent
commit
ca456eb137
Signed by: Simon Vieille <simon@deblan.fr> GPG Key ID: 03383D15A1D31745
3 changed files with 5 additions and 5 deletions
  1. 1
    1
      bin/vhost-add
  2. 3
    3
      src/templates/vhost-http.twig
  3. 1
    1
      src/templates/vhost-https.twig

+ 1
- 1
bin/vhost-add View File

@@ -101,7 +101,7 @@ fi

if [ "$WEB_HTTPS" = "yes" ]; then
VHOST_FILE_SA="/etc/apache2/sites-available/${DOMAIN}.${WEB_HTTPS_PORT}.conf"
VHOST_FILE_SE="/etc/apache2/sites-enabled/${DOMAIN}.${WEB_HTTP_PORT}.conf"
VHOST_FILE_SE="/etc/apache2/sites-enabled/${DOMAIN}.${WEB_HTTPS_PORT}.conf"

PORT=$WEB_HTTPS_PORT template vhost-https > "$VHOST_FILE_SA"


+ 3
- 3
src/templates/vhost-http.twig View File

@@ -9,7 +9,7 @@
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" %}
{% if WEB_HTTPS_FORCE == "yes" %}

Redirect permanent / https://{{ DOMAIN }}/
{% endif %}
@@ -29,6 +29,6 @@
</FilesMatch>'
</IfModule>
{% endif %}
{% block extra %}{% endblock %}
{% block extra %}{% endblock extra %}
</VirtualHost>
{% endblock %}
{% endblock body %}

+ 1
- 1
src/templates/vhost-https.twig View File

@@ -20,4 +20,4 @@

BrowserMatch "MSIE [2-6]" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
{% endblock %}
{% endblock extra %}

Loading…
Cancel
Save