|
|
@@ -43,7 +43,7 @@ |
|
|
|
}, |
|
|
|
} -%} |
|
|
|
|
|
|
|
<VirtualHost {% for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}> |
|
|
|
<VirtualHost {% for intf in vals.interfaces %} {{ intf }}:{{ vals.port }}{% endfor -%}> |
|
|
|
ServerName {{ vals.ServerName }} |
|
|
|
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} |
|
|
|
|
|
|
@@ -67,9 +67,9 @@ |
|
|
|
{% if site.get('SSLCertificateFile') %}SSLEngine on |
|
|
|
SSLCertificateFile {{ site.SSLCertificateFile }} |
|
|
|
{% if site.get('SSLCertificateKeyFile') %}SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}{% endif %} |
|
|
|
{% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile}}{% endif %} |
|
|
|
{% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile }}{% endif %} |
|
|
|
{% endif %} |
|
|
|
|
|
|
|
|
|
|
|
{% if site.get('Rewrite') %}RewriteEngine on |
|
|
|
{{ site.Rewrite }} |
|
|
|
{% endif %} |
|
|
@@ -93,7 +93,7 @@ |
|
|
|
<Directory "{{ path }}"> |
|
|
|
{% if dvals.get('Options') != False %}Options {{ dvals.Options }}{% endif %} |
|
|
|
{% if map.version == '2.4' %} |
|
|
|
{% if dvals.get('Require') != False %}Require {{dvals.Require}}{% endif %} |
|
|
|
{% if dvals.get('Require') != False %}Require {{ dvals.Require }}{% endif %} |
|
|
|
{% else %} |
|
|
|
{% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %} |
|
|
|
{% if dvals.get('Allow') != False %}Allow {{ dvals.Allow }}{% endif %} |
|
|
@@ -117,7 +117,7 @@ |
|
|
|
|
|
|
|
<Location "{{ path }}"> |
|
|
|
{% if map.version == '2.4' %} |
|
|
|
{%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %} |
|
|
|
{%- if lvals.get('Require') != False %}Require {{ lvals.Require }}{% endif %} |
|
|
|
{% else %} |
|
|
|
{%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %} |
|
|
|
{%- if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %} |