summaryrefslogtreecommitdiff
path: root/src/installer
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-07-14 17:32:53 +0200
committerLeif Johansson <leifj@sunet.se>2010-07-14 17:32:53 +0200
commit6977cbe00e4fe6f3bb8023c0c02d7e987c49997f (patch)
tree22c477c99928f55d41d79d086781a7ed4824477c /src/installer
parentbbe1c513b9bd5b19ecf0e47099414516018c3a8f (diff)
fewer urls should work...
Diffstat (limited to 'src/installer')
-rw-r--r--src/installer/resources/install.properties2
-rw-r--r--src/installer/resources/wayfconfig.xml12
2 files changed, 3 insertions, 11 deletions
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>