Merge pull request #2344 from ekohl/simplify-templates

Simplify templates by reusing methods

Author: david22swan

templates/mod/ext_filter.conf.erb

@@ -1,6 +1,4 @@
 # mod_ext_filter definitions
-<%- if @ext_filter_define.length >= 1 -%>
-<%- @ext_filter_define.keys.sort.each do |name| -%>
-ExtFilterDefine <%= name %> <%= @ext_filter_define[name] %>
-<%- end -%>
+<%- @ext_filter_define.sort.each do |name, value| -%>
+ExtFilterDefine <%= name %> <%= value %>
 <%- end -%>

templates/vhost/_directories.erb

@@ -464,7 +464,7 @@
       <%- directory_proxy_pass.flatten.compact.each do |proxy| -%>
     <%= proxy_pass -%> <%= proxy['url'] -%>
         <%- if proxy['params'] -%>
-          <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+          <%- proxy['params'].sort.each do |key, value| -%> <%= key %>=<%= value -%>
           <%- end -%>
         <%- end -%>
         <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>

templates/vhost/_proxy.erb

@@ -19,7 +19,7 @@
   <%- end -%>
   ProxyPass <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
-    <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+    <%- proxy['params'].sort.each do |key, value| -%> <%= key %>=<%= value -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>
@@ -56,7 +56,7 @@
   <%- end -%>
   ProxyPassMatch <%= proxy['path'] %> <%= proxy['url'] -%>
   <%- if proxy['params'] -%>
-    <%- proxy['params'].keys.sort.each do |key| -%> <%= key %>=<%= proxy['params'][key] -%>
+    <%- proxy['params'].sort.each do |key, value| -%> <%= key %>=<%= value -%>
     <%- end -%>
   <%- end -%>
   <%- if proxy['keywords'] %> <%= proxy['keywords'].join(' ') -%>

templates/vhost/_wsgi.erb

@@ -25,19 +25,19 @@
   WSGIProcessGroup <%= @wsgi_process_group %>
 <% end -%>
 <% if @wsgi_script_aliases_match and ! @wsgi_script_aliases_match.empty? -%>
-  <%- @wsgi_script_aliases_match.keys.sort.reverse.each do |key| -%>
-    <%- if key != '' and @wsgi_script_aliases_match[key] != ''-%>
-  WSGIScriptAliasMatch <%= key %> "<%= @wsgi_script_aliases_match[key] %>"
+  <%- @wsgi_script_aliases_match.sort.reverse.each do |key, value| -%>
+    <%- if key != '' and value != ''-%>
+  WSGIScriptAliasMatch <%= key %> "<%= value %>"
     <%- end -%>
   <%- end -%>
 <% end -%>
 <% if @wsgi_script_aliases and ! @wsgi_script_aliases.empty? -%>
-  <%- @wsgi_script_aliases.keys.sort.reverse.each do |key| -%>
-    <%- if key != '' and @wsgi_script_aliases[key] != ''-%>
-      <%- if @wsgi_script_aliases[key].is_a? Array -%>
-  WSGIScriptAlias <%= key %> <%= @wsgi_script_aliases[key].join(' ') %>
+  <%- @wsgi_script_aliases.sort.reverse.each do |key, value| -%>
+    <%- if key != '' and value != ''-%>
+      <%- if value.is_a? Array -%>
+  WSGIScriptAlias <%= key %> <%= value.join(' ') %>
       <%- else -%>
-  WSGIScriptAlias <%= key %> "<%= @wsgi_script_aliases[key] %>"
+  WSGIScriptAlias <%= key %> "<%= value %>"
       <%- end -%>
     <%- end -%>
   <%- end -%>