Fix Shib setting rules.

ShibRequireSetting is not a real thing. I think it was a mixup between ShibRequireSession
and ShibRequestSetting. I've replaced it with separate options for both. The latter is
an array as you can set a variety of diffrent settings, while the latter is a simple
On or Off value. Each item in the settings array should be the name and value of the setting,
e.g. ['requireSession false', 'applicationId myresource']

templates/vhost/_directories.erb

@@ -196,8 +196,13 @@
       <%- end -%>
     <%- end -%>
     <%- if @shibboleth_enabled -%>
-      <%- if directory['shib_require_setting'] and ! directory['shib_require_setting'].empty? -%>
-    ShibRequireSetting <%= directory['shib_require_setting'] %>
+      <%- if directory['shib_require_session'] and ! directory['shib_require_session'].empty? -%>
+    ShibRequireSession <%= directory['shib_require_session'] %>
+      <%- end -%>
+      <%- if directory['shib_request_settings'] -%>
+        <%- Array(directory['shib_request_settings']).each do |setting| -%>
+    ShibRequestSetting <%= setting %>
+        <%- end -%>
       <%- end -%>
       <%- if directory['shib_use_headers'] and ! directory['shib_use_headers'].empty? -%>
     ShibUseHeaders <%= directory['shib_use_headers'] %>