Merge pull request #293 from SuperTux88/refactor-vhosts-template

refactor(vhosts): reduce empty lines in standard.tmpl and proxy.tmpl

apache/config/vhosts/proxy.tmpl

@@ -2,7 +2,7 @@
 # This file is managed by Salt! Do not edit by hand!
 #
 {# Define default values here so the template below can just focus on layout #}
-{% set sitename = site.get('ServerName', id) %}
+{% set sitename = site.get('ServerName', id) -%}
 {% set vals = {
     'interfaces': site.get('interface', '*').split(),
     'port': site.get('port', '80'),
@@ -33,8 +33,9 @@
         'Allow': 'from all',
         'Require': 'all granted',
     },
-} %}
-<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 %}
     {% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %}
@@ -50,17 +51,17 @@
     SSLCertificateFile {{ site.SSLCertificateFile }}
     {% if site.get('SSLCertificateKeyFile') %}SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}{% endif %}
     {% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile }}{% endif %}
-    {% endif %}
+    {%- endif %}
     {% if site.get('Rewrite') %}RewriteEngine on
-    {{ site.Rewrite }}
-    {%  endif %}
-    {%   if site.get('SSLProxyEngine') %}SSLProxyEngine {{ site.SSLProxyEngine }}{% endif %}
+    {{ site.Rewrite|indent(4) }}
+    {%- endif %}
+    {% if site.get('SSLProxyEngine') %}SSLProxyEngine {{ site.SSLProxyEngine }}{% endif %}
     ProxyRequests {{ vals.ProxyRequests }}
     ProxyPreserveHost {{ vals.ProxyPreserveHost }}
     {% if site.get('ProxyErrorOverride') %}ProxyErrorOverride {{ site.ProxyErrorOverride }} {% endif %}
     {% if site.get('ProxyErrorDir') %}ProxyPass /{{ site.ProxyErrorDir }}/ ! {% endif %}
-    {% for proxy, proxyargs in vals.ProxyRoute|dictsort|reverse %}
-    {% set proxyvals = {
+    {%- for proxy, proxyargs in vals.ProxyRoute|dictsort|reverse %}
+    {%- set proxyvals = {
         'ProxyPassSource': proxyargs.get('ProxyPassSource', '/'),
         'ProxyPassTarget': proxyargs.get('ProxyPassTarget', 'https://{0}'.format(sitename)),
         'ProxyPassTargetOptions': proxyargs.get('ProxyPassTargetOptions', ''),
@@ -72,59 +73,59 @@
     ProxyPassReverse  {{ proxyvals.ProxyPassReverseSource }} {{ proxyvals.ProxyPassReverseTarget }}
     {% endfor %}
 
-    {% for path, loc in site.get('Location', {}).items() %}
-    {% set lvals = {
+    {%- for path, loc in site.get('Location', {}).items() %}
+    {%- set lvals = {
         'Order': loc.get('Order', vals.Location.Order),
         'Allow': loc.get('Allow', vals.Location.Allow),
         'Require': loc.get('Require', vals.Location.Require),
         'Dav': loc.get('Dav', False),
     } %}
     <Location "{{ path }}">
-      {% if apache.version == '2.4' %}
+      {%- if apache.version == '2.4' %}
       {% if lvals.get('Require') != False %}Require {{ lvals.Require }}{% endif %}
-      {% else %}
+      {%- else %}
       {% if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %}
       {% if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %}
-      {% endif %}
+      {%- endif %}
       {% if loc.get('Formula_Append') %} {{ loc.Formula_Append|indent(8) }} {% endif %}
     </Location>
     {% endfor %}
-    {% for regpath, locmat in site.get('LocationMatch', {}).items() %}
-    {% set lmvals = {
+    {%- for regpath, locmat in site.get('LocationMatch', {}).items() %}
+    {%- set lmvals = {
         'Order': locmat.get('Order', vals.LocationMatch.Order),
         'Allow': locmat.get('Allow', vals.LocationMatch.Allow),
         'Require': locmat.get('Require', vals.LocationMatch.Require),
         'Dav': locmat.get('Dav', False),
     } %}
     <LocationMatch "{{ regpath }}">
-      {% if apache.version == '2.4' %}
+      {%- if apache.version == '2.4' %}
       {% if lmvals.get('Require') != False %}Require {{ lmvals.Require }}{% endif %}
-      {% else %}
+      {%- else %}
       {% if lmvals.get('Order') != False %}Order {{ lmvals.Order }}{% endif %}
       {% if lmvals.get('Allow') != False %}Allow {{ lmvals.Allow }}{% endif %}
-      {% endif %}
+      {%- endif %}
       {% if locmat.get('Formula_Append') %} {{ locmat.Formula_Append|indent(8) }} {% endif %}
     </LocationMatch>
     {% endfor %}
- {% for proxypath, prox in site.get('Proxy_control', {}).items() %}
-   {% set proxvals = {
+ {%- for proxypath, prox in site.get('Proxy_control', {}).items() %}
+   {%- set proxvals = {
      'AllowAll': prox.get('AllowAll', vals.AllowAll),
      'AllowCountry': prox.get('AllowCountry', vals.AllowCountry),
      'AllowIP': prox.get('AllowIP', vals.AllowIP),
    } %}
     <Proxy "{{ proxypath }}">
-      {% if proxvals.get('AllowAll') != False %}
+      {%- if proxvals.get('AllowAll') != False %}
       Require all granted
-      {% else %}
+      {%- else %}
       {% if proxvals.get('AllowCountry') != False %}{% set country_list = proxvals.get('AllowCountry', {}) %}GeoIPEnable On
       {% for every_country in country_list %}SetEnvIf GEOIP_COUNTRY_CODE {{ every_country }} AllowCountry
       {% endfor %}Require env AllowCountry {% endif %}
-      {% if proxvals.get('AllowIP') is defined %} {% set ip_list = proxvals.get('AllowIP', {}) %}
+      {% if proxvals.get('AllowIP') is defined %}{% set ip_list = proxvals.get('AllowIP', {}) %}
       Require ip {% for every_ip in ip_list %}{{ every_ip }} {% endfor %} {% endif %}
-     {% endif %}
+      {%- endif %}
    </Proxy>
- {% endfor %}
-    {% if site.get('Formula_Append') %}
+ {%- endfor %}
+    {%- if site.get('Formula_Append') %}
     {{ site.Formula_Append|indent(4) }}
-    {% endif %}
+    {%- endif %}
 </VirtualHost>

apache/config/vhosts/standard.tmpl

@@ -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 %}
 
@@ -68,22 +68,22 @@
     SSLCertificateFile {{ site.SSLCertificateFile }}
     {% if site.get('SSLCertificateKeyFile') %}SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}{% endif %}
     {% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile }}{% endif %}
-    {% endif %}
+    {%- endif %}
 
     {% if site.get('Rewrite') %}RewriteEngine on
-    {{ site.Rewrite }}
-    {%  endif %}
+    {{ site.Rewrite|indent(4) }}
+    {%- endif %}
 
-    {% for loc, path in site.get('Alias', {}).items() %}
+    {%- for loc, path in site.get('Alias', {}).items() %}
     Alias {{ loc }} {{ path }}
-    {% endfor %}
+    {%- endfor %}
 
-    {% for loc, path in site.get('ScriptAlias', {}).items() %}
+    {%- for loc, path in site.get('ScriptAlias', {}).items() %}
     ScriptAlias {{ loc }} {{ path }}
-    {% endfor %}
+    {%- endfor %}
 
-    {% for path, dir in site.get('Directory', {}).items() -%}
-    {% set dvals = {
+    {%- for path, dir in site.get('Directory', {}).items() %}
+    {%- set dvals = {
         'Options': dir.get('Options', vals.Directory.Options),
         'Order': dir.get('Order', vals.Directory.Order),
         'Allow': dir.get('Allow', vals.Directory.Allow),
@@ -92,28 +92,27 @@
         'Dav': dir.get('Dav', False),
     } %}
 
-    {% if path == 'default' %}{% set path = vals.Directory_default %}{% endif %}
+    {%- if path == 'default' %}{% set path = vals.Directory_default %}{% endif %}
 
     <Directory "{{ path }}">
         {% if dvals.get('Options') != False %}Options {{ dvals.Options }}{% endif %}
-        {% if map.version == '2.4' %}
+        {%- if map.version == '2.4' %}
         {% if dvals.get('Require') != False %}Require {{ dvals.Require }}{% endif %}
-        {% else %}
+        {%- else %}
         {% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %}
-
         {% if dvals.get('Allow') != False %}Allow {{ dvals.Allow }}{% endif %}
-        {% endif %}
+        {%- endif %}
         {% if dvals.get('AllowOverride') != False %}AllowOverride {{ dvals.AllowOverride }}{% endif %}
         {% if dvals.get('Dav') != False %}Dav On{% endif %}
 
-        {% if dir.get('Formula_Append') %}
+        {%- if dir.get('Formula_Append') %}
         {{ dir.Formula_Append|indent(8) }}
-        {% endif %}
+        {%- endif %}
     </Directory>
-    {% endfor %}
+    {%- endfor %}
 
-    {% for path, loc in site.get('Location', {}).items() %}
-    {% set lvals = {
+    {%- for path, loc in site.get('Location', {}).items() %}
+    {%- set lvals = {
         'Order': loc.get('Order', vals.Location.Order),
         'Allow': loc.get('Allow', vals.Location.Allow),
         'Require': loc.get('Require', vals.Location.Require),
@@ -121,21 +120,21 @@
     } %}
 
     <Location "{{ path }}">
-        {% if map.version == '2.4' %}
+        {%- if map.version == '2.4' %}
         {% if lvals.get('Require') != False %}Require {{ lvals.Require }}{% endif %}
-        {% else %}
+        {%- else %}
         {% if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %}
         {% if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %}
-        {% endif %}
+        {%- endif %}
         {% if lvals.get('Dav') != False %}Dav On{% endif %}
 
-        {% if loc.get('Formula_Append') %}
+        {%- if loc.get('Formula_Append') %}
         {{ loc.Formula_Append|indent(8) }}
-        {% endif %}
+        {%- endif %}
     </Location>
-    {% endfor %}
+    {%- endfor %}
 
-    {% if site.get('Formula_Append') %}
+    {%- if site.get('Formula_Append') %}
     {{ site.Formula_Append|indent(4) }}
-    {% endif %}
+    {%- endif %}
 </VirtualHost>