From f5f5d635c0486e8205169dd90c120be5d2ea44d1 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 15 Oct 2013 12:27:08 +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 | 9 +++++++++
 swamid-interfederations-1.0/wayf.wayf.dk.xml | 4 ----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 48380178..1f7be6a3 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-10-06T18: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-10-19T10:17:01Z" 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 28108480..e2356329 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -11,6 +11,7 @@
       <shibmd:Scope regexp="false">as-skole.no</shibmd:Scope>
       <shibmd:Scope regexp="false">askim.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">askoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">askvoll.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">asnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">aure.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">austagderfk.no</shibmd:Scope>
@@ -73,6 +74,7 @@
       <shibmd:Scope regexp="false">feide.stranda.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">feide.trysil.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ffk.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">fjaler.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">fjell.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">flaa.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">flesberg.kommune.no</shibmd:Scope>
@@ -85,6 +87,7 @@
       <shibmd:Scope regexp="false">frosta.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">froya.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">fusa.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">giske.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">gjemnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">gloppen.kommune.no</shibmd:Scope>
@@ -95,6 +98,7 @@
       <shibmd:Scope regexp="false">gs.alesund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">gs.skodje.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">gs.sula.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gulen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ha.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hadsel.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">haldenskole.no</shibmd:Scope>
@@ -102,6 +106,7 @@
       <shibmd:Scope regexp="false">hamar.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">hbv.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>
@@ -135,8 +140,10 @@
       <shibmd:Scope regexp="false">holeskolen.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hornindal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">horten.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hoyanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
       <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
@@ -173,6 +180,7 @@
       <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">mrfylke.no</shibmd:Scope>
       <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nes-bu.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nesset.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nfk.no</shibmd:Scope>
@@ -229,6 +237,7 @@
       <shibmd:Scope regexp="false">snillfjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sogndal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sola.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">solund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sorum.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">spusers.feide.no</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index 46af2a52..daa12147 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -139,10 +139,6 @@
       <shibmd:Scope regexp="false">gribskovgymnasium.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">gefion-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">kmduni.dans.kmd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">peduni.dans.kmd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">hovuni.dans.kmd.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">nybuni.dans.kmd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">eucnvs.dk</shibmd:Scope>
-- 
cgit v1.2.3