From e375a0d2fa10b9242fdd35470a94a590055e76fd Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 4 Jun 2013 15:11:19 +0200
Subject: 
 https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml
 into swamid-interfederations-1.0

---
 swamid-interfederations-1.0/.xml                   | 2 +-
 swamid-interfederations-1.0/idp.feide.no.xml       | 2 +-
 swamid-interfederations-1.0/moodle.helsinki.fi.xml | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 1f242bd3..a3ade2bd 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2013-06-03T20:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2013-06-08T12:17:02Z" cacheDuration="PT345600S">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index e91c74e9..4432526f 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -92,8 +92,8 @@
       <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
       <shibmd:Scope regexp="false">halsa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">haraldsplass.no</shibmd:Scope>
       <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hdh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
       <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
       <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/moodle.helsinki.fi.xml b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
index 1d80741e..980f82db 100644
--- a/swamid-interfederations-1.0/moodle.helsinki.fi.xml
+++ b/swamid-interfederations-1.0/moodle.helsinki.fi.xml
@@ -4,8 +4,8 @@
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
       <mdui:UIInfo>
-          <mdui:DisplayName xml:lang="en">University of Helsinki\'s Moodle</mdui:DisplayName>
           <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">University of Helsinki\'s Moodle</mdui:DisplayName>
           <mdui:Description xml:lang="en">University of Helsinki\'s Moodle learning management system.</mdui:Description>
           <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
           <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
@@ -79,8 +79,8 @@ xOnjwN+/aD6pbl0TUZiPIcYi0vo7nF+k2TGS+FvQ4VoWPdOWYQ==</ds:X509Certificate>
     <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Aarno</md:GivenName>
-    <md:SurName>Sandvik</md:SurName>
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
     <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3