Add the minimum required shibboleth declarations to directories hashe…

…s. Ignored if mod_shib not defined.

manifests/vhost.pp

@@ -248,6 +248,9 @@
   # Is apache::mod::passenger enabled (or apache::mod['passenger'])
   $passenger_enabled = defined(Apache::Mod['passenger'])
 
+  # Is apache::mod::shib enabled (or apache::mod['shib2'])
+  $shibboleth_enabled = defined(Apache::Mod['shib2'])
+
   # Define log file names
   if $access_log_file {
     $access_log_destination = "${logroot}/${access_log_file}"
@@ -482,6 +485,7 @@
   # - $docroot
   # - $apache_version
   # - $suphp_engine
+  # - $shibboleth_enabled
   if $_directories and ! empty($_directories) {
     concat::fragment { "${name}-directories":
       target  => "${priority_real}-${filename}.conf",

templates/vhost/_directories.erb

@@ -195,6 +195,14 @@
         <%- end -%>
       <%- end -%>
     <%- end -%>
+    <%- if @shibboleth_enabled -%>
+      <%- if directory['shib_require_setting'] and ! directory['shib_require_setting'].empty? -%>
+    ShibRequireSetting <%- directory['shib_require_setting'] -%>
+      <%- end -%>
+      <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>
+    ShibUseHeaders <%- directory['shib_use_headers'] -%>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['custom_fragment'] -%>
     <%= directory['custom_fragment'] %>
     <%- end -%>