saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Append slash to RedirectTarget (#161)

Browse Source
This commit is contained in:
dexbleeker 2016-10-18 21:48:59 +02:00 committed by Forrest
parent ffec46e8d5
commit bf66e749d1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apache/vhosts/redirect.tmpl
View File

@ -1,8 +1,8 @@
{# Define default values here so the template below can just focus on layout #} {# Define default values here so the template below can just focus on layout #}
{% from "apache/map.jinja" import apache with context %} {%- from "apache/map.jinja" import apache with context %}
{% set sitename = site.get('ServerName', id) %} {%- set sitename = site.get('ServerName', id) %}
{% set vals = { {%- set vals = {
'interfaces': site.get('interface', '*').split(), 'interfaces': site.get('interface', '*').split(),
'port': site.get('port', '80'), 'port': site.get('port', '80'),
@ -19,8 +19,7 @@
'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
'RedirectSource': site.get('RedirectSource', '/'), 'RedirectSource': site.get('RedirectSource', '/'),
'RedirectTarget': site.get('RedirectTarget', 'https://{0}'.format(sitename)), 'RedirectTarget': site.get('RedirectTarget', 'https://{0}/'.format(sitename)),
} %} } %}
<VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}> <VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>