Simplify the way requires are passed to the template

Author: smortex

manifests/mod/status.pp

@@ -42,8 +42,7 @@
   $status_params = {
     'extended_status'   => $extended_status,
     'status_path'       => $status_path,
-    'requires'          => $requires,
-    'requires_defaults' => $requires_defaults,
+    'requires'          => $requires.lest || { $requires_defaults },
   }
   file { 'status.conf':
     ensure  => file,

templates/mod/_require.epp

@@ -1,29 +1,28 @@
-<% $_requires = if $requires { $requires } else { $requires_defaults} -%>
-<% if type($_requires, 'generalized') == String { -%>
-  <%- if !($_requires.downcase in ['', 'unmanaged']) { -%>
-    Require <%= $_requires %>
+<% if type($requires, 'generalized') == String { -%>
+  <%- if !($requires.downcase in ['', 'unmanaged']) { -%>
+    Require <%= $requires %>
   <%- } -%>
-<% }elsif String(type($_requires, 'generalized')).index('Array') == 0 { -%>
-  <%- $_requires.each |$req| { -%>
+<% }elsif String(type($requires, 'generalized')).index('Array') == 0 { -%>
+  <%- $requires.each |$req| { -%>
     Require <%= $req %>
   <%- } -%>
-<% }elsif String(type($_requires, 'generalized')).index('Hash') == 0 { -%>
-  <%- if $_requires['enforce'] and $_requires['enforce'].downcase in ['all', 'none', 'any'] { -%>
-    <%- $enforce_str = "Require${_requires['enforce'].capitalize}>\n" -%>
+<% }elsif String(type($requires, 'generalized')).index('Hash') == 0 { -%>
+  <%- if $requires['enforce'] and $requires['enforce'].downcase in ['all', 'none', 'any'] { -%>
+    <%- $enforce_str = "Require${requires['enforce'].capitalize}>\n" -%>
     <%- $enforce_open = "    <${enforce_str}" -%>
     <%- $enforce_close = "    </${enforce_str}" -%>
     <%- $indentation = '    ' -%>
   <%- } else { -%>
-    <%- if $_requires['enforce'] { -%>
+    <%- if $requires['enforce'] { -%>
       <%- scope.function_warning(["Class #{@title}: Require can only be overwritten with all, none or any."]) -%>
     <%- } -%>
     <%- $enforce_open = '' -%>
     <%- $enforce_close = '' -%>
     <%- $indentation = '' -%>
   <%- } -%>
-  <%- if $_requires['requires'] and String(type($_requires['requires'], 'generalized')).index('Array') == 0 { -%>
+  <%- if $requires['requires'] and String(type($requires['requires'], 'generalized')).index('Array') == 0 { -%>
 <%# %><%= $enforce_open -%>
-      <%- $_requires['requires'].each |$req| { -%>
+      <%- $requires['requires'].each |$req| { -%>
 <%# %>    <%= $indentation -%>Require <%= $req %>
       <%- } -%>
 <%# %><%= $enforce_close -%>

templates/mod/status.conf.epp

@@ -1,6 +1,6 @@
 <Location <%= $status_path %>>
     SetHandler server-status
-<%= epp("apache/mod/_require.epp", { 'requires' => $requires, 'requires_defaults' => $requires_defaults }) -%>
+<%= epp("apache/mod/_require.epp", { 'requires' => $requires }) -%>
 </Location>
 ExtendedStatus <%= $extended_status %>