diff --git a/manifests/profile/www_lib/vhosts/fulcrum.pp b/manifests/profile/www_lib/vhosts/fulcrum.pp index 9c9f92118..fe76b7987 100644 --- a/manifests/profile/www_lib/vhosts/fulcrum.pp +++ b/manifests/profile/www_lib/vhosts/fulcrum.pp @@ -19,11 +19,13 @@ String $servername = 'www.fulcrum.org' ) { $authz_base_requires = { - enforce => 'all', - requires => [ + auth_type => 'shibboleth', + custom_fragment => 'ShibRequestSetting requireSession 0', + enforce => 'all', + requires => [ 'not env badrobot', 'not env loadbalancer', - 'all granted' + 'shibboleth' ] } @@ -154,12 +156,6 @@ XSendFile on XSendFilePath ${derivatives_path} XSendFilePath ${alt_derivatives_path} - # Configure Shibboleth for authentication via InCommon partner login - - AuthType shibboleth - ShibRequestSetting requireSession 0 - Require shibboleth - | EOT } }