From e99292cff5d16114a7b6754734349ffabbe70407 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Fri, 29 Apr 2016 08:46:07 +0200 Subject: Resolves SWAMIDOPS-8161 --- swamid-edugain-idp-1.0.mxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'swamid-edugain-idp-1.0.mxml') diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index ae3d78a2..5f04c98d 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -35,7 +35,6 @@ - @@ -53,4 +52,5 @@ + -- cgit v1.2.3 From 972b8d367f5ba5b33696097de893f5b7406c7a97 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Fri, 29 Apr 2016 14:38:36 +0200 Subject: Remove the "new ladok only" KI IdP from eduGAIN to prevent UK filtering, resolves SWAMIDOPS-8167 --- swamid-edugain-idp-1.0.mxml | 1 - swamid-idp-2.0.mxml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'swamid-edugain-idp-1.0.mxml') diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index 5f04c98d..57b92aeb 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -46,7 +46,6 @@ - diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 205a6e86..72a58d03 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -10,4 +10,5 @@ + -- cgit v1.2.3 From 2e75f05d43b9d66219bd7b8f4953a4d669d5770f Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Mon, 2 May 2016 15:59:24 +0200 Subject: SWAMIDOPS-8158 Step 5 IdP upgrade --- swamid-2.0/idp.irf.se-idp-shibboleth.xml | 15 +++++-- swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml | 47 ++++++++++++++++------ swamid-edugain-idp-1.0.mxml | 2 +- swamid-idp-2.0.mxml | 2 +- 4 files changed, 47 insertions(+), 19 deletions(-) (limited to 'swamid-edugain-idp-1.0.mxml') diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml index ae28e676..ff589283 100644 --- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml +++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml @@ -1,11 +1,18 @@ + + + + http://refeds.org/category/hide-from-discovery + + + irf.se - Institutet för rymdfysik - Swedish Institute of Space Physics + Institutet för rymdfysik (gammal) + Swedish Institute of Space Physics (old) Identity Provider för Institutet för rymdfysik Identity Provider for the Swedish Institute of Space Physics http://www.irf.se @@ -94,8 +101,8 @@ XCYbfP8E3cs4MB+K IRF - Institutet för rymdfysik - Swedish Institute of Space Physics + Institutet för rymdfysik (gammal) + Swedish Institute of Space Physics (old) http://www.irf.se diff --git a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml index 0dffd552..a2279075 100644 --- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml +++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml @@ -1,19 +1,28 @@ - - - - http://refeds.org/category/hide-from-discovery - - - irf.se - Institutet för rymdfysik (ny) - Swedish Institute of Space Physics (new) + Institutet för rymdfysik + Swedish Institute of Space Physics + Identity Provider för Institutet för rymdfysik + Identity Provider for the Swedish Institute of Space Physics + http://www.irf.se + https://www.irf.se/image/IRF_logo.png + https://www.irf.se/image/IRF_logo.png + https://www.irf.se/image/IRF_logo.png + http://documents.irf.se/get_document.php?group=Computer%26docid=302 + irf kiruna rymdcampus rymdfysik + irf kiruna rymdcampus rymdfysik + + irf.se + 192.71.13.0/24 + 193.10.33.0/24 + 192.71.152.0/24 + geo:67.84,20.41 + @@ -187,14 +196,26 @@ CQNfH97cIrTE5N/RQ7XWcw== IRF - Institutet för rymdfysik (ny) - Swedish Institute of Space Physics (new) + Institutet för rymdfysik + Swedish Institute of Space Physics http://www.irf.se + + Swedish Institute of Space Physics + Mats Luspa + mailto:datagruppen@irf.se + +4698079000 + - Institutet för rymdfysik + Swedish Institute of Space Physics + Mats Luspa + mailto:matsl@irf.se + +4698079022 + + + Swedish Institute of Space Physics Mats Luspa mailto:matsl@irf.se - +46 980 79 022 + +4698079022 diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml index 57b92aeb..dd45fb19 100644 --- a/swamid-edugain-idp-1.0.mxml +++ b/swamid-edugain-idp-1.0.mxml @@ -20,7 +20,6 @@ - @@ -52,4 +51,5 @@ + diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml index 72a58d03..e03116d2 100644 --- a/swamid-idp-2.0.mxml +++ b/swamid-idp-2.0.mxml @@ -8,7 +8,7 @@ - + -- cgit v1.2.3