Simplify the template

Author: ekohl

spec/classes/pulpcore_spec.rb

@@ -224,6 +224,7 @@
             .with_priority('10')
             .with_content(
 <<CONTENT
+
   <Location "/pulp/content">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
@@ -240,18 +241,21 @@
             .with_priority('10')
             .with_content(
 <<CONTENT
+
   <Location "/pulp/content">
     RequestHeader unset X-CLIENT-CERT
     RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
     ProxyPass http://127.0.0.1:24816/pulp/content
     ProxyPassReverse http://127.0.0.1:24816/pulp/content
   </Location>
+
   <Location "/pulp/api/v3">
     RequestHeader unset REMOTE_USER
     RequestHeader set REMOTE_USER "%{SSL_CLIENT_S_DN_CN}s" env=SSL_CLIENT_S_DN_CN
     ProxyPass http://127.0.0.1:24817/pulp/api/v3
     ProxyPassReverse http://127.0.0.1:24817/pulp/api/v3
   </Location>
+
   ProxyPass /assets/ http://127.0.0.1:24817/assets/
   ProxyPassReverse /assets/ http://127.0.0.1:24817/assets/
 CONTENT

templates/apache-fragment.epp

@@ -11,16 +11,17 @@
       Optional[reverse_urls] => Array[String[1]],
     }]],
   }]] $directories,
-  Optional[Array[Hash[String, String]]] $proxy_pass = undef,
+  Array[Hash[String, String]] $proxy_pass = [],
 | -%>
-<%-
-$directories.each |$directory| {
-  if $directory['provider'] =~ /^(.*)match$/ {
-    $provider = $1.capitalize + 'Match'
-  } else {
-    $provider = $directory['provider'].capitalize
-  }
--%>
+<%- $directories.each |$directory| { -%>
+
+  <%-
+    if $directory['provider'] =~ /^(.*)match$/ {
+      $provider = $1.capitalize + 'Match'
+    } else {
+      $provider = $directory['provider'].capitalize
+    }
+  -%>
   <<%= $provider %> "<%= $directory['path'] %>">
     <%- if $directory['options'] { -%>
     Options <%= $directory['options'].join(' ') %>
@@ -36,25 +37,24 @@ $directories.each |$directory| {
     <%-   } -%>
     <%- } -%>
     <%- if $directory['proxy_pass'] and $provider in ['Location', 'LocationMatch'] { -%>
-    <%- $directory['proxy_pass'].each |$proxy| { -%>
+    <%-   $directory['proxy_pass'].each |$proxy| { -%>
     ProxyPass <%= $proxy['url'] -%>
-    <%- if $proxy['params'] { -%>
-    <%- $proxy['params'].sort.each |$key, $value| { -%> <%= $key %>=<%= $value -%><%- } -%>
-    <%- } %>
-    <%- if $proxy['reverse_urls'] { -%>
-    <%- $proxy['reverse_urls'].each |$reverse_url| { -%>
+    <%-     if $proxy['params'] { -%>
+    <%-       $proxy['params'].sort.each |$key, $value| { -%> <%= $key %>=<%= $value -%><%- } -%>
+    <%-     } %>
+    <%-     if $proxy['reverse_urls'] { -%>
+    <%-       $proxy['reverse_urls'].each |$reverse_url| { -%>
     ProxyPassReverse <%= $reverse_url %>
-    <%- } -%>
-    <%- } else { -%>
+    <%-       } -%>
+    <%-     } else { -%>
     ProxyPassReverse <%= $proxy['url'] %>
-    <%- } -%>
-    <%- } -%>
+    <%-     } -%>
+    <%-   } -%>
     <%- } -%>
   </<%= $provider %>>
 <% } -%>
-<% if $proxy_pass { -%>
 <% $proxy_pass.each |$proxy| { -%>
+
   ProxyPass <%= $proxy['path'] %> <%= $proxy['url'] %>
   ProxyPassReverse <%= $proxy['path'] %> <%= $proxy['url'] %>
 <% } -%>
-<% } -%>