summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-10-28 15:05:33 +0200
committerLeif Johansson <leifj@sunet.se>2011-10-28 15:05:33 +0200
commit0be71df53bfd141e00e9af547e3c58200f5bdbc4 (patch)
treeff0bf383d2da8673b6bf6371c962bafb85a7fba7
parent16f08a13105f16a993d2b10fd38c1880aecc3d37 (diff)
more md
-rw-r--r--src/installer/resources/wayfconfig.xml30
1 files changed, 27 insertions, 3 deletions
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 04ad398..1248dfc 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -64,14 +64,26 @@
-->
- <MetadataProvider displayName="SWAMID" identifier="SWAMID-1.0"
+ <MetadataProvider displayName="SWAMID 1.0" 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"
+ <MetadataProvider displayName="SWAMID 2.0" identifier="SWAMID-2.0"
url="http://md.swamid.se/md/swamid-2.0.xml"
backingFile="/opt/shibboleth-ds/metadata/swamid-2.0.xml"/>
+ <MetadataProvider
+ displayName="UK Federation"
+ identifier="UKFED"
+ backingFile="/opt/shibboleth-ds/metadata/ukfederation-metadata.xml"
+ url="http://metadata.ukfederation.org.uk/ukfederation-metadata.xml"/>
+
+ <MetadataProvider
+ displayName="Kalmar2"
+ identifier="Kalmar2"
+ backingFile="opt/shibboleth-ds/metadata/kalmarcentral2.xml"
+ url="http://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml"/>
+
<!-- If the WAYF is to handle data from more than one metadata source
then more metadataproviders can be provided, as below
@@ -158,29 +170,41 @@
<DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
<PluginInstance identifier="DeleteCookiePlugin"/>
+ <Federation identifier="SWAMID-1.0"/>
+ <Federation identifier="SWAMID-2.0"/>
</DiscoveryServiceHandler>
<DiscoveryServiceHandler location="https://ds.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
<PluginInstance identifier="CookiePlugin"/>
+ <Federation identifier="SWAMID-1.0"/>
+ <Federation identifier="SWAMID-2.0"/>
</DiscoveryServiceHandler>
<DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
<PluginInstance identifier="DeleteCookiePlugin"/>
+ <Federation identifier="SWAMID-1.0"/>
+ <Federation identifier="SWAMID-2.0"/>
</DiscoveryServiceHandler>
<DiscoveryServiceHandler location="https://wayf.swamid.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
<PluginInstance identifier="CookiePlugin"/>
+ <Federation identifier="SWAMID-1.0"/>
+ <Federation identifier="SWAMID-2.0"/>
</DiscoveryServiceHandler>
<DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
<PluginInstance identifier="DeleteCookiePlugin"/>
+ <Federation identifier="SWAMID-1.0"/>
+ <Federation identifier="SWAMID-2.0"/>
</DiscoveryServiceHandler>
<DiscoveryServiceHandler location="https://ds.sunet.se(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
<PluginInstance identifier="CookiePlugin"/>
+ <Federation identifier="SWAMID-1.0"/>
+ <Federation identifier="SWAMID-2.0"/>
</DiscoveryServiceHandler>
- <DiscoveryServiceHandler provideListOfList="true" location="https://idp-test.nordu.net(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
+ <DiscoveryServiceHandler provideListOfList="true" location="https://idp-test.nordu.net(:[0-9]+)?/(.+/)?(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
<PluginInstance identifier="CookiePlugin"/>
</DiscoveryServiceHandler>