deblan
/
vhost-manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix issue with twig

This commit is contained in:
Simon Vieille 2019-07-31 00:04:37 +02:00
parent eef2a50ff1
commit ca456eb137
Signed by: deblan
GPG Key ID: 03383D15A1D31745
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/vhost-add
View File

@ -101,7 +101,7 @@ fi
if [ "$WEB_HTTPS" = "yes" ]; then if [ "$WEB_HTTPS" = "yes" ]; then
VHOST_FILE_SA="/etc/apache2/sites-available/${DOMAIN}.${WEB_HTTPS_PORT}.conf" 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" PORT=$WEB_HTTPS_PORT template vhost-https > "$VHOST_FILE_SA"

6
src/templates/vhost-http.twig
View File

@ -9,7 +9,7 @@
SuexecUserGroup {{ SYSTEM_USER_USERNAME }} {{ SYSTEM_USER_GROUP }} SuexecUserGroup {{ SYSTEM_USER_USERNAME }} {{ SYSTEM_USER_GROUP }}
ErrorLog /services/web/logs/{{ DOMAIN }}.log ErrorLog /services/web/logs/{{ DOMAIN }}.log
CustomLog /services/web/logs/{{ DOMAIN }}.log combined CustomLog /services/web/logs/{{ DOMAIN }}.log combined
{% if WEB_HTTPS_FORCE = "yes" %} {% if WEB_HTTPS_FORCE == "yes" %}
Redirect permanent / https://{{ DOMAIN }}/ Redirect permanent / https://{{ DOMAIN }}/
{% endif %} {% endif %}
@ -29,6 +29,6 @@
</FilesMatch>' </FilesMatch>'
</IfModule> </IfModule>
{% endif %} {% endif %}
{% block extra %}{% endblock %} {% block extra %}{% endblock extra %}
</VirtualHost> </VirtualHost>
{% endblock %} {% endblock body %}

2
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 [2-6]" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
{% endblock %} {% endblock extra %}