summaryrefslogtreecommitdiff
path: root/src/installer
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-07-14 13:02:22 +0200
committerLeif Johansson <leifj@sunet.se>2010-07-14 13:03:02 +0200
commitdf74919eba10a00eb083daf3c90c7ac75644af6b (patch)
treef4ba5337876ee26c8bfbbc4317f6f798dae5b5f3 /src/installer
parentcb4806cb91b3ea6a01613bbfe68a9e04ed255578 (diff)
swamid config
Diffstat (limited to 'src/installer')
-rw-r--r--src/installer/resources/install.properties2
-rw-r--r--src/installer/resources/wayfconfig.xml21
2 files changed, 18 insertions, 5 deletions
diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties
index 6de85c4..ae3bea0 100644
--- a/src/installer/resources/install.properties
+++ b/src/installer/resources/install.properties
@@ -1,2 +1,2 @@
-#Mon Jun 28 14:25:15 CEST 2010
+#Wed Jul 14 12:58:23 CEST 2010
ds.home=/opt/shibboleth-ds
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index a797b54..d511d92 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -72,10 +72,9 @@
-->
- <MetadataProvider
- displayName="Federation Name"
- identifier="FirstSite"
- url="file://$DS_HOME$/metadata/sites.xml"/>
+ <MetadataProvider displayName="" identifier="SWAMID-1.0"
+ url="http://wayf.swamid.se/md/swamid-1.0.xml"
+ backingFile="/opt/shibboleth-ds/metadata/swamid-1.0.xml"/>
<!-- If the WAYF is to handle data from more than one metadata source
then more metadataproviders can be provided, as below
@@ -168,6 +167,20 @@
<PluginInstance identifier="CookiePlugin"/>
</DiscoveryServiceHandler>
+ <DiscoveryServiceHandler location=".+/ds.sunet.se/WAYF" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location=".+/ds.sunet.se/DS" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+ <DiscoveryServiceHandler location=".+/ds.swamid.se/WAYF" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
+
+ <DiscoveryServiceHandler location=".+/ds.swamid.se/DS" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+ <PluginInstance identifier="CookiePlugin"/>
+ </DiscoveryServiceHandler>
</WayfConfig>