From df74919eba10a00eb083daf3c90c7ac75644af6b Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 14 Jul 2010 13:02:22 +0200
Subject: swamid config

---
 src/installer/resources/install.properties |  2 +-
 src/installer/resources/wayfconfig.xml     | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'src')

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>
-- 
cgit v1.1