openstack
/
keystone
Code Issues Proposed changes

Merge "Exclude old Shibboleth options from docs"

This commit is contained in:
Jenkins 2015-11-17 15:07:38 +00:00 committed by Gerrit Code Review
parent 03b0e50cdb c7047d8321
commit 7b6a5a7515
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/federation/shibboleth.rst
View File

@ -48,10 +48,13 @@ a *<Location>* directive for each identity provider::
ShibRequestSetting requireSession 1 ShibRequestSetting requireSession 1
ShibRequestSetting applicationId idp_1 ShibRequestSetting applicationId idp_1
AuthType shibboleth AuthType shibboleth
ShibRequireAll On
ShibRequireSession On
ShibExportAssertion Off ShibExportAssertion Off
Require valid-user Require valid-user
<IfVersion < 2.4>
ShibRequireSession On
ShibRequireAll On
</IfVersion>
</Location> </Location>
.. NOTE:: .. NOTE::
@ -61,7 +64,7 @@ a *<Location>* directive for each identity provider::
The same name is used inside the shibboleth2.xml configuration file but they could The same name is used inside the shibboleth2.xml configuration file but they could
be different. be different.
* The ``ShibRequireSession`` and ``ShibRequireAll`` rules are invalid in * The ``ShibRequireSession`` and ``ShibRequireAll`` rules are invalid in
Apache 2.4+ and should be dropped in that specific setup. Apache 2.4+.
* You are advised to carefully examine `Shibboleth Apache configuration * You are advised to carefully examine `Shibboleth Apache configuration
documentation documentation
<https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig>`_ <https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig>`_