summaryrefslogtreecommitdiff
path: root/src/installer
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-10-28 14:33:41 +0200
committerLeif Johansson <leifj@sunet.se>2011-10-28 14:33:41 +0200
commit2e8a6700f899f0955c5d266eed897dcb09c65c65 (patch)
treea3043e1fd832b3e50f12b231b5ecf0a6e1b8c880 /src/installer
parentfb2f3976e45d77cf3426e85e00c89e0ee1cff553 (diff)
parentb5b4e8d1ebf824defc52d3340acf439c69a059d1 (diff)
merged ds.sunet.se and idp.nordu.net
Diffstat (limited to 'src/installer')
-rw-r--r--src/installer/resources/wayfconfig.xml65
1 files changed, 50 insertions, 15 deletions
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 1df1e07..456647e 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -64,10 +64,13 @@
-->
- <MetadataProvider
- displayName="Federation Name"
- identifier="FirstSite"
- url="file://$DS_HOME$/metadata/sites.xml"/>
+ <MetadataProvider displayName="SWAMID" identifier="SWAMID-1.0"
+ 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
@@ -122,31 +125,63 @@
-->
- <DiscoveryServiceHandler
- location=".+/WAYF"
- default="true">
- <PluginInstance identifier="CookiePlugin"/>
- <!--
- <PluginInstance identifier="AddressHint"/> -->
- </DiscoveryServiceHandler>
-
-<!-- The ClearCache handler causes the cookie to be deleted. The jsp shipped
+ <!-- The ClearCache handler causes the cookie to be deleted. The jsp shipped
with the WAYF refers to this handler -->
-
+
+<!--
<DiscoveryServiceHandler
location=".+/ClearCache.wayf">
<PluginInstance identifier="DeleteCookiePlugin"/>
</DiscoveryServiceHandler>
+-->
<!-- Example of how to constrain a DiscoveryService to one (or more)
explicit metadata sources. (The default is to use all metadata
sources)
- <DiscoveryServiceHandler location=".+/SecondOnly.wayf" >
+ <DiscoveryServiceHandler location=".+/SecondOnly.wayf" >
<Federation identifier="SecondSite"/>
<PluginInstance identifier="CookiePlugin"/>
</DiscoveryServiceHandler>
-->
+<!-- The Javascript handler downloads javascript arrays with the IdPs and the cookies -->
+ <DiscoveryServiceHandler
+ location=".+/js.wayf"
+ provideList="true"
+ provideListOfList="false"
+ default="false"
+ jspFile="/javascript.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+ <PluginInstance identifier="DeleteCookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+ <PluginInstance identifier="DeleteCookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+ <PluginInstance identifier="DeleteCookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+ <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>