From 30289aafb2a5abf8c52bdc5231d5b7e44a14be32 Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Wed, 7 Dec 2016 13:27:59 +0100 Subject: do not copy swamid-signer.crt to published-metadata --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 35dadc70..d539d5fe 100644 --- a/Makefile +++ b/Makefile @@ -77,8 +77,8 @@ swamid-interfederations2: swamid: swamid-2.0.pub swamid-no-interfederation-combined.pub swamid-discovery.pub swamid-idp.pub swamid-idp-transitive.pub swamid-registered.pub swamid-testing-1.0.pub swamid-testing-idp-1.0.pub -web: $(SITE) $(TOU) $(CERT) - rsync -avz $(CERT) $(TOU) $(SITE)/ $(DEST) +web: $(SITE) $(TOU) + rsync -avz $(TOU) $(SITE)/ $(DEST) swamid-interfederations-idp-2.0.xml: swamid-interfederations-2.0.mxml @xsltproc --xinclude xslt/extract-idp.xslt swamid-interfederations-2.0.mxml > swamid-interfederations-idp-2.0.xml -- cgit v1.2.3 From 05dd3e4c33733fb6d96a75848d62ce46d563114b Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Wed, 7 Dec 2016 13:49:42 +0100 Subject: jira-test.its.umu.se-shibboleth.xml removed (is missing certificate) --- swamid-2.0/jira-test.its.umu.se-shibboleth.xml | 49 -------------------------- swamid-sp-2.0.mxml | 1 - 2 files changed, 50 deletions(-) delete mode 100644 swamid-2.0/jira-test.its.umu.se-shibboleth.xml diff --git a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml b/swamid-2.0/jira-test.its.umu.se-shibboleth.xml deleted file mode 100644 index 15dc6617..00000000 --- a/swamid-2.0/jira-test.its.umu.se-shibboleth.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - http://www.swamid.se/category/hei-service - http://www.swamid.se/category/research-and-education - - - - - - - - - - ITS Jira-instans för test - ITS Jira-instans för test - Test-instansen av Jira för ITS, Umeå universitet. - Test-instance of Jira for ITS, Umeå universitet - - - - - - - - - - - - - - - - - - diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index f52e5f29..0eaad0ea 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -316,7 +316,6 @@ - -- cgit v1.2.3 From b6b2dbae841f6da329a022a04652cfb82c19e8b5 Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Wed, 7 Dec 2016 15:14:59 +0100 Subject: cambro-staging-next.umdc.umu.se obsolete --- .../cambro-staging-next.umdc.umu.se-shibboleth.xml | 42 ---------------------- swamid-sp-2.0.mxml | 1 - 2 files changed, 43 deletions(-) delete mode 100644 swamid-2.0/cambro-staging-next.umdc.umu.se-shibboleth.xml diff --git a/swamid-2.0/cambro-staging-next.umdc.umu.se-shibboleth.xml b/swamid-2.0/cambro-staging-next.umdc.umu.se-shibboleth.xml deleted file mode 100644 index b22ac3b5..00000000 --- a/swamid-2.0/cambro-staging-next.umdc.umu.se-shibboleth.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 0eaad0ea..f8b3efcd 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -217,7 +217,6 @@ - -- cgit v1.2.3 From 093d4b30288d678b3d3e5ceb392fca718b450747 Mon Sep 17 00:00:00 2001 From: Paul Scott Date: Thu, 8 Dec 2016 13:26:56 +0100 Subject: SWAMIDOPS-8417 --- swamid-2.0/indico.uu.se-shibboleth-sso.xml | 53 ----------------- swamid-2.0/indico.uu.se-shibboleth.xml | 92 ++++++++++++++++++++++++++++++ swamid-sp-2.0.mxml | 2 +- 3 files changed, 93 insertions(+), 54 deletions(-) delete mode 100644 swamid-2.0/indico.uu.se-shibboleth-sso.xml create mode 100644 swamid-2.0/indico.uu.se-shibboleth.xml diff --git a/swamid-2.0/indico.uu.se-shibboleth-sso.xml b/swamid-2.0/indico.uu.se-shibboleth-sso.xml deleted file mode 100644 index b0b380c6..00000000 --- a/swamid-2.0/indico.uu.se-shibboleth-sso.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - Indico - Indico - Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar. - Indico is an event management system for meetings, conferences and lectures. - https://indico.uu.se/images/logo_indico.png - - - - - - -MIID6zCCAlOgAwIBAgIJAKx2XCsmViuCMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV -BAMTDGluZGljby51dS5zZTAeFw0xNjExMjQxMjQ5MjFaFw0yNjExMjIxMjQ5MjFa -MBcxFTATBgNVBAMTDGluZGljby51dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP -ADCCAYoCggGBALjMMPXhMYcxfgSGSyfl+dSpnyOfYB7rFQQRy0ulOMAWrjOlLmtD -QAfxsh/4liVGsJEBNx9P/nX9iwsp7HPlaUYszincN1oLp86RTovg0rvhUV8FQVB4 -9AvlPutKnxuI3cIwE4lbHlmk5qrTShyX1snPlYUEMmscW/naiWsXTRAbcUzG3FTo -hfzluac6KN3zLp1Db/7atElFED0mFLYI0G/ANUCXbIsFJ8kMr/0rYSZ1fUVwqSCL -T/l+8ft5ViEp8I7M7o8454LQGvMXZoCtQcdVfKWzaf44H6nhXFqnV8y/ZnUUdY4Y -NZwPS9GcAsxyUd9UdVTHiVccCyf4pJEAGWPpjnxzervyACwDPk2mNWiVAoEVrWIY -8c1qg5tPI+DSU6a3X9sx+SZsx58R/sinNnRzcIDrJ6egSibOfNd9kLW0fL/bctfy -d3E0eQf+F7ctWedbrSiJHGK3wGwWlP+SulVTgxnTD11tEe5OyPxoiIBeZamjMPIM -JQOmoeoIWWuh5wIDAQABozowODAXBgNVHREEEDAOggxpbmRpY28udXUuc2UwHQYD -VR0OBBYEFP6PZrTeByfio/pWGzRr9jxz3nZ2MA0GCSqGSIb3DQEBCwUAA4IBgQBT -9NM+TG9b7XcDxZ7PP09BJnbLyypdJaxwipcLFN/DrE133cQ84ngcBJrhN+IIpsQG -tQH7k326CeOPURNFh/QrQoyvGx4aGawzmVyGjDKBa1DyIYMpiXlLc9AGAYNbTnH+ -1VwriPYuD91nzNz/IXDJhwBeSfztxs9GuBoxBQdRh0VmkTnDxD3zWf68pcdtDke1 -WX7mIGG5OIrJwwKEE7TVD2Ntvnn07VkYsC6OZGFl7xwmobezymHoCc14FXbUApSn -xCbvpiqcEpHZGzPNB3bvBdglYiKFbvq95oYgHrVn2hsFx4b0Eu06aWCHdXO61n5Y -81yET16MCeVzu/zece86QUX9TNapu/63XH3s00uC5rEMvwUnJRAwubGE4LESs364 -mBuS8hsaMu5++ZZgUiIVUSKRcMaoGOG4/qGni3P0IJlmSNPh08Ba3F3pPXbed3eO -S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ= - - - - - - - - - - Björn - Wiberg - mailto:bjorn.wiberg@uadm.uu.se - - diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml new file mode 100644 index 00000000..edfd8d97 --- /dev/null +++ b/swamid-2.0/indico.uu.se-shibboleth.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Indico + Indico + Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar. + Indico is an event management system for meetings, conferences and lectures. + https://indico.uu.se/images/logo_indico.png + + + + + indico.uu.se + + CN=indico.uu.se + MIID6zCCAlOgAwIBAgIJAKx2XCsmViuCMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV +BAMTDGluZGljby51dS5zZTAeFw0xNjExMjQxMjQ5MjFaFw0yNjExMjIxMjQ5MjFa +MBcxFTATBgNVBAMTDGluZGljby51dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGP +ADCCAYoCggGBALjMMPXhMYcxfgSGSyfl+dSpnyOfYB7rFQQRy0ulOMAWrjOlLmtD +QAfxsh/4liVGsJEBNx9P/nX9iwsp7HPlaUYszincN1oLp86RTovg0rvhUV8FQVB4 +9AvlPutKnxuI3cIwE4lbHlmk5qrTShyX1snPlYUEMmscW/naiWsXTRAbcUzG3FTo +hfzluac6KN3zLp1Db/7atElFED0mFLYI0G/ANUCXbIsFJ8kMr/0rYSZ1fUVwqSCL +T/l+8ft5ViEp8I7M7o8454LQGvMXZoCtQcdVfKWzaf44H6nhXFqnV8y/ZnUUdY4Y +NZwPS9GcAsxyUd9UdVTHiVccCyf4pJEAGWPpjnxzervyACwDPk2mNWiVAoEVrWIY +8c1qg5tPI+DSU6a3X9sx+SZsx58R/sinNnRzcIDrJ6egSibOfNd9kLW0fL/bctfy +d3E0eQf+F7ctWedbrSiJHGK3wGwWlP+SulVTgxnTD11tEe5OyPxoiIBeZamjMPIM +JQOmoeoIWWuh5wIDAQABozowODAXBgNVHREEEDAOggxpbmRpY28udXUuc2UwHQYD +VR0OBBYEFP6PZrTeByfio/pWGzRr9jxz3nZ2MA0GCSqGSIb3DQEBCwUAA4IBgQBT +9NM+TG9b7XcDxZ7PP09BJnbLyypdJaxwipcLFN/DrE133cQ84ngcBJrhN+IIpsQG +tQH7k326CeOPURNFh/QrQoyvGx4aGawzmVyGjDKBa1DyIYMpiXlLc9AGAYNbTnH+ +1VwriPYuD91nzNz/IXDJhwBeSfztxs9GuBoxBQdRh0VmkTnDxD3zWf68pcdtDke1 +WX7mIGG5OIrJwwKEE7TVD2Ntvnn07VkYsC6OZGFl7xwmobezymHoCc14FXbUApSn +xCbvpiqcEpHZGzPNB3bvBdglYiKFbvq95oYgHrVn2hsFx4b0Eu06aWCHdXO61n5Y +81yET16MCeVzu/zece86QUX9TNapu/63XH3s00uC5rEMvwUnJRAwubGE4LESs364 +mBuS8hsaMu5++ZZgUiIVUSKRcMaoGOG4/qGni3P0IJlmSNPh08Ba3F3pPXbed3eO +S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Björn + Wiberg + mailto:bjorn.wiberg@uadm.uu.se + + diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index f8b3efcd..9203e368 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -624,6 +624,6 @@ - + -- cgit v1.2.3