diff options
Diffstat (limited to 'src/installer/resources/wayfconfig.xml')
| -rw-r--r-- | src/installer/resources/wayfconfig.xml | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index 9ebdd12..456647e 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -18,12 +18,11 @@ The jspFile & errorJspFile attributes control the display The provideList attribute controls whether a single list of all - possible IdPs is presented. This also controls whether the - Quick search dialog is presented. + possible IdPs is presented. The default wayf.jsp works best + if this is true when provideListofList is true. The provideListOfList attribute controls whether multiple lists - are presented (one for each MetadataProvider). Rather than all - the entities as one. + are presented (one for each MetadataProvider). The showUsableIdPs attribute controls the contents of the above lists. The single list (provideList=true) is trimmed by @@ -33,20 +32,13 @@ The SearchIgnore element contains a list of words to be ignored while performing a search. - - warnOnBadBinding describes what to do iof the metadata has a badly - formed <DiscoveryResponse> false (or not present) means that the bad - SP is removed from the metadata and an error written to the log file. - True means that we just noter this in the log file. - THIS SETTING IS SYSTEM WIDE ONLY. --> <Default jspFile="wayf.jsp" errorJspFile="wayferror.jsp" - provideList="true" - provideListOfList="false" - warnOnBadBinding="false" + provideList="false" + provideListOfList="true" showUnusableIdPs="false"> <SearchIgnore> <IgnoreText>Institution</IgnoreText> @@ -68,14 +60,18 @@ be used if the DS cannot get hold of the 'real' data. NOTE - for windows installation with an explicit DOS device ("C:\etc\discoveryservice") - The url below should be "file://C:\program files/metadata/sites.xml + The url below should be "file:///$DS_HOME$/metadata/sites.xml --> <MetadataProvider displayName="SWAMID" identifier="SWAMID-1.0" - url="http://wayf.swamid.se/md/swamid-1.0.xml" + url="http://md.swamid.se/md/swamid-1.0.xml" backingFile="/opt/shibboleth-ds/metadata/swamid-1.0.xml"/> + <MetadataProvider displayName="SWAMID2" identifier="SWAMID-2.0" + url="http://md.swamid.se/md/swamid-2.0.xml" + backingFile="/opt/shibboleth-ds/metadata/swamid-2.0.xml"/> + <!-- If the WAYF is to handle data from more than one metadata source then more metadataproviders can be provided, as below @@ -118,8 +114,8 @@ element. As well as the attributes and elements described above, each DiscoveryServiceHandler *MUST* have a location attribute. - The default wayf.xml specifies that "/WAYF", "/DS" and "/*.wayf" - are the possibilities for DiscoveryServices. If a URL matches the above, + The default wayf.xml specifies that "/WAYF" and "/*.wayf" are the + possibilities for DiscoveryServices. If a URL matches the above, but does not match any location in a DiscoveryServiceHandler, then the first handler for which the default attribute is set true is invoked. @@ -157,7 +153,6 @@ provideListOfList="false" default="false" jspFile="/javascript.jsp"> - <Federation identifier="SWAMID-1.0"/> <PluginInstance identifier="CookiePlugin"/> </DiscoveryServiceHandler> @@ -185,4 +180,8 @@ <PluginInstance identifier="CookiePlugin"/> </DiscoveryServiceHandler> + <DiscoveryServiceHandler location="https://idp-test.nordu.net(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror-ndn.jsp"> + <PluginInstance identifier="CookiePlugin"/> + </DiscoveryServiceHandler> + </WayfConfig> |