Skip to content

Commit

Permalink
Fix Shib setting rules.
Browse files Browse the repository at this point in the history
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']
  • Loading branch information
halfninja committed Oct 10, 2014
1 parent d051887 commit 846adab
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions templates/vhost/_directories.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] %>
Expand Down

0 comments on commit 846adab

Please sign in to comment.