From 84b175348f3b5679549cbab512b1eb7af1b5554c Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Mon, 17 Mar 2014 17:27:44 +0100 Subject: ki mdui and contactperson update --- swamid-2.0/kiidp.ki.se-idp-shibboleth.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'swamid-2.0') diff --git a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml index 715f62a5..8d817da9 100644 --- a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml +++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml @@ -11,6 +11,7 @@ https://kiidp.ki.se/images/ki_logo_292x146.png + ki.se 130.229.0.0/18 130.237.96.0/19 130.237.128.0/20 @@ -20,12 +21,10 @@ 193.10.140.0/22 194.14.96.0/24 2001:06B0:0022::/48 - 136.155.0.0/16 159.38.0.0/16 193.10.63.0/24 193.10.76.0/24 - ki.se geo:59.3475753,18.0279382 geo:59.219589,17.940939 @@ -106,8 +105,22 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg== Karolinska Institutet http://www.ki.se + + Karolinska Institutet + Malin Westerberg + malin.westerberg@ki.se + +46 8 524 86693 + Karolinska Institutet + Eric Johansson + eric.johansson@ki.se + +46 8 524 86382 + + + Karolinska Institutet + IT-support it-support@ki.se + +46 8 524 82222 -- cgit v1.2.3 From 98770bb838dd5b84dd332c6d4f44b5d6b69e07d9 Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Wed, 19 Mar 2014 09:49:56 +0100 Subject: research-and-scholarship added to weblogin.uu.se SWAMIDOPS-7186 --- Makefile | 2 ++ swamid-2.0/weblogin.uu.se-idp-shibboleth.xml | 7 +++++++ 2 files changed, 9 insertions(+) (limited to 'swamid-2.0') diff --git a/Makefile b/Makefile index 73daf009..9441db91 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,8 @@ tidy: committest: test @echo "Checking for entity-categories in SPSSODescriptors" @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true + @echo "Checking for entity-categories in IDPSSODescriptor" + @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(/dev/null | grep -q entity-category ; then echo " $$x" ; fi ; done | grep . && exit 1 || true @echo "Checking for MDUI in EntityDescriptor/Extensions" @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed 's;\(/dev/null | grep -q . ; then echo " $$x" ; fi ; done | grep . && exit 1 || true diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml index a14d88d1..26bf09dc 100644 --- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml +++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml @@ -1,5 +1,12 @@ + + + + http://refeds.org/category/research-and-scholarship + + + user.uu.se -- cgit v1.2.3 From c731703949db26d4a540eda12e507a74d1bbc049 Mon Sep 17 00:00:00 2001 From: Fredrik Åslund Date: Wed, 19 Mar 2014 11:09:07 +0100 Subject: bad entity category for samltest.swamid.se fixed SWAMIDOPS-7187 --- swamid-2.0/samltest.swamid.se-r_and_s-sp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'swamid-2.0') diff --git a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml index f7998bd5..45f49ea9 100644 --- a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml +++ b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml @@ -3,7 +3,7 @@ - http://id.incommon.org/category/research-and-scholarship + http://refeds.org/category/research-and-scholarship -- cgit v1.2.3