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/installer/resources')

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


From bbe1c513b9bd5b19ecf0e47099414516018c3a8f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 14 Jul 2010 17:22:41 +0200
Subject: fix bug in config

---
 src/installer/resources/wayfconfig.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index d511d92..26e2c75 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -72,7 +72,7 @@
      
       -->
 
-      <MetadataProvider displayName="" identifier="SWAMID-1.0"
+      <MetadataProvider displayName="SWAMID" identifier="SWAMID-1.0"
                 url="http://wayf.swamid.se/md/swamid-1.0.xml"
                 backingFile="/opt/shibboleth-ds/metadata/swamid-1.0.xml"/>
 
@@ -163,7 +163,7 @@
         provideListOfList="false"
         default="false"
         jspFile="/javascript.jsp">
-        <Federation identifier="FirstSite"/>
+        <Federation identifier="SWAMID-1.0"/>
         <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-- 
cgit v1.1


From 6977cbe00e4fe6f3bb8023c0c02d7e987c49997f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 14 Jul 2010 17:32:53 +0200
Subject: fewer urls should work...

---
 src/installer/resources/install.properties |  2 +-
 src/installer/resources/wayfconfig.xml     | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties
index ae3bea0..c10e185 100644
--- a/src/installer/resources/install.properties
+++ b/src/installer/resources/install.properties
@@ -1,2 +1,2 @@
-#Wed Jul 14 12:58:23 CEST 2010
+#Wed Jul 14 17:28:34 CEST 2010
 ds.home=/opt/shibboleth-ds
diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 26e2c75..e034303 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -167,19 +167,11 @@
         <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location=".+/ds.sunet.se/WAYF" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+    <DiscoveryServiceHandler location=".+/ds.sunet.se" 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">
+    <DiscoveryServiceHandler location=".+/ds.swamid.se" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-- 
cgit v1.1


From e56c794705028420a06122a9da0f7895394ae66f Mon Sep 17 00:00:00 2001
From: root <root@ds2.sunet.se>
Date: Wed, 14 Jul 2010 17:35:23 +0200
Subject: remove generated file from repo

---
 src/installer/resources/install.properties | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 src/installer/resources/install.properties

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties
deleted file mode 100644
index c10e185..0000000
--- a/src/installer/resources/install.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Wed Jul 14 17:28:34 CEST 2010
-ds.home=/opt/shibboleth-ds
-- 
cgit v1.1


From f1ab5bb6e64afac460f77ea57c37ecb59f09957d Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 14 Jul 2010 18:01:44 +0200
Subject: java regexp matching implicitly matches whole string

---
 src/installer/resources/wayfconfig.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index e034303..1817b87 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -167,11 +167,11 @@
         <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location=".+/ds.sunet.se" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+    <DiscoveryServiceHandler location=".+/ds.sunet.se/.+" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location=".+/ds.swamid.se" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+    <DiscoveryServiceHandler location=".+/ds.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-- 
cgit v1.1


From 075171ef09818d78b12bfc3fa5b1a299b026f245 Mon Sep 17 00:00:00 2001
From: root <root@ds2.sunet.se>
Date: Wed, 14 Jul 2010 22:21:01 +0200
Subject: working skin

---
 src/installer/resources/wayfconfig.xml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 1817b87..d47a631 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -129,14 +129,6 @@
       -->
 
 
-    <DiscoveryServiceHandler
-        location=".+/WAYF" 
-        default="true">
-        <PluginInstance identifier="CookiePlugin"/>
-        <!--
-            <PluginInstance identifier="AddressHint"/> -->
-    </DiscoveryServiceHandler>
-   
  <!-- The ClearCache handler causes the cookie to be deleted.  The jsp shipped
      with the WAYF refers to this handler -->
         
@@ -149,7 +141,7 @@
      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"/>
@@ -167,11 +159,11 @@
         <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location=".+/ds.sunet.se/.+" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+    <DiscoveryServiceHandler location="https://ds.sunet.se/.+" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location=".+/ds.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+    <DiscoveryServiceHandler location="https://ds.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-- 
cgit v1.1


From 04d464c7d27d850e51b3f082d92862f1a3c03d9e Mon Sep 17 00:00:00 2001
From: root <root@ds2.sunet.se>
Date: Wed, 14 Jul 2010 22:32:52 +0200
Subject: alias for  wayf.swamid.se to ds.sunet.se

---
 src/installer/resources/wayfconfig.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index d47a631..f6c468b 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -167,4 +167,8 @@
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
+    <DiscoveryServiceHandler location="https://wayf.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+       <PluginInstance identifier="CookiePlugin"/>
+    </DiscoveryServiceHandler>
+
 </WayfConfig>
-- 
cgit v1.1


From 97825dc24f555d7f735b05d49216c174f9f13cb7 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sun, 18 Jul 2010 23:01:42 +0200
Subject: major update for the sunet ds

---
 src/installer/resources/wayfconfig.xml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'src/installer/resources')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index f6c468b..9ebdd12 100644
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -131,11 +131,13 @@
 
  <!-- 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
@@ -159,15 +161,27 @@
         <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler location="https://ds.sunet.se/.+" jspFile="wayf-sunet.jsp" errorJspFile="wayferror-sunet.jsp">
+    <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://ds.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+    <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://wayf.swamid.se/.+" jspFile="wayf-swamid.jsp" errorJspFile="wayferror-swamid.jsp">
+    <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>
 
-- 
cgit v1.1