SWAMID-936 Removed https://play.hkr.se

3 files changed, 5 insertions, 68 deletions

diff --git a/scripts/remove_entity.sh b/scripts/remove_entity.sh
index 0d418b45..2de5d0ba 100755
--- a/scripts/remove_entity.sh
+++ b/scripts/remove_entity.sh
@@ -29,7 +29,7 @@ file="swamid-2.0/$entityidfn"
 
 if [ -r "$file" ]; then
 	echo "---------------------"
-	grep $entityidfn *.mxml sp-with-simplesign
+	grep "/$entityidfn" *.mxml sp-with-simplesign
 	echo "---------------------"
 	echo -n "OK to remove ? [Y/n]"
 	read x
@@ -46,18 +46,18 @@ if [ -r "$file" ]; then
 	fi
 	if (grep -q $entityidfn sp-with-simplesign); then
 		if ( $MacOSX ) ; then
-			sed -i "" "/$entityidfn/d" sp-with-simplesign
+			sed -i "" "/\/$entityidfn/d" sp-with-simplesign
 		else
-			sed -i "/$entityidfn/d" sp-with-simplesign
+			sed -i "/\/$entityidfn/d" sp-with-simplesign
 		fi
 	fi
 	git rm $file
 
 	grep $file *.mxml | sed 's/\(.*\.mxml\):  <xi:include href=".*"\/>/\1/' | while read mxmlfile ; do
 		if ( $MacOSX ) ; then
-			sed -i "" "/$entityidfn/d" $mxmlfile
+			sed -i "" "/\/$entityidfn/d" $mxmlfile
 		else
-			sed -i "/$entityidfn/d" $mxmlfile
+			sed -i "/\/$entityidfn/d" $mxmlfile
 		fi
 	done
 	git diff
diff --git a/swamid-2.0/play.hkr.se.xml b/swamid-2.0/play.hkr.se.xml
deleted file mode 100644
index bc76ed51..00000000
--- a/swamid-2.0/play.hkr.se.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://play.hkr.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-09-17T10:25:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">HKR Play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">HKR Play</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Kristianstad Play Service</mdui:Description>
-        <mdui:Description xml:lang="sv">Högskolan Kristianstads Playtjänst</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIExzCCA6+gAwIBAgIJAJ8w7l9XLcoDMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTAeFw0xNTA5MTQxMjA2NDZaFw0yNTA5MTMxMjA2NDZaMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANQlu+lhb9yqf/8s5TxbohOyOh/qqULM+c2Pv4OivD9i0cPNlMKColq/ainIgPU91kBDsaG933CwOvlWHgcmUNIWO4KRi1W1CTTZ0b4Rl++kolFSIOSFhSRdap/9IPt1Ajr667ejNn3G4YA3v8ZgZhCXHW/FkevNPgTZuUL8nzkN0Jnl5hJeaubZUhhul7lNe2B+s/revviqEYtR8Ph++rtwJbuNeMZ6YswkspyjGa8cFOTZYInmB+tGQ9jMK/CdYZU5ZS68pEBHxd84CUne8oNB1kHTC6U1HUDEUD3vb/XDjgG1WzFBzUVHjUBxYMXd9ME67uQyV/xaiAdcFJbV/LkCAwEAAaOCAQYwggECMB0GA1UdDgQWBBS0FxmsB2XHAmqtd4xS0wpmTUmDezCB0gYDVR0jBIHKMIHHgBS0FxmsB2XHAmqtd4xS0wpmTUmDe6GBo6SBoDCBnTELMAkGA1UEBhMCU0UxDjAMBgNVBAgTBVNrYW5lMRUwEwYDVQQHEwxLcmlzdGlhbnN0YWQxHzAdBgNVBAoTFkhvZ3Nrb2xhbiBLcmlzdGlhbnN0YWQxEzARBgNVBAsTCklULXNlcnZpY2UxFDASBgNVBAMTC3BsYXkuaGtyLnNlMRswGQYJKoZIhvcNAQkBFgxhZG1pbkBoa3Iuc2WCCQCfMO5fVy3KAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABi8Exz8XRt64P9ilnf3MKAJ2YI+lm70DpYOp5YDiNpfYG4cLA2ki2jmr14jxDM585SkmNKnLuZQ5Mf6zYgbLEQ9qkg0aDLHQ1lX7MclsipEnB3NV2PNAz5zAnYB/RznQN+0HYKo98Jg6T6HfMLZPG6E8DL4bMN0LOc6KfHTP+H9K2t5auNAvks7HCaj4cTVxZkW8OsmI57RXtxvW+k47S7aEO5BsDJdnzs9vFpBWqneECQxhYh8HT7VZwx8WTDxkQ4ofuo97GsX4TprGOTJGBm/DvpcMOFjHk716dES9nS5N0hPV4eBHRVTHAyOKbJQguJBsMaF7mDcjQh0rS5Vyu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIExzCCA6+gAwIBAgIJAJ8w7l9XLcoDMA0GCSqGSIb3DQEBBQUAMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTAeFw0xNTA5MTQxMjA2NDZaFw0yNTA5MTMxMjA2NDZaMIGdMQswCQYDVQQGEwJTRTEOMAwGA1UECBMFU2thbmUxFTATBgNVBAcTDEtyaXN0aWFuc3RhZDEfMB0GA1UEChMWSG9nc2tvbGFuIEtyaXN0aWFuc3RhZDETMBEGA1UECxMKSVQtc2VydmljZTEUMBIGA1UEAxMLcGxheS5oa3Iuc2UxGzAZBgkqhkiG9w0BCQEWDGFkbWluQGhrci5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANQlu+lhb9yqf/8s5TxbohOyOh/qqULM+c2Pv4OivD9i0cPNlMKColq/ainIgPU91kBDsaG933CwOvlWHgcmUNIWO4KRi1W1CTTZ0b4Rl++kolFSIOSFhSRdap/9IPt1Ajr667ejNn3G4YA3v8ZgZhCXHW/FkevNPgTZuUL8nzkN0Jnl5hJeaubZUhhul7lNe2B+s/revviqEYtR8Ph++rtwJbuNeMZ6YswkspyjGa8cFOTZYInmB+tGQ9jMK/CdYZU5ZS68pEBHxd84CUne8oNB1kHTC6U1HUDEUD3vb/XDjgG1WzFBzUVHjUBxYMXd9ME67uQyV/xaiAdcFJbV/LkCAwEAAaOCAQYwggECMB0GA1UdDgQWBBS0FxmsB2XHAmqtd4xS0wpmTUmDezCB0gYDVR0jBIHKMIHHgBS0FxmsB2XHAmqtd4xS0wpmTUmDe6GBo6SBoDCBnTELMAkGA1UEBhMCU0UxDjAMBgNVBAgTBVNrYW5lMRUwEwYDVQQHEwxLcmlzdGlhbnN0YWQxHzAdBgNVBAoTFkhvZ3Nrb2xhbiBLcmlzdGlhbnN0YWQxEzARBgNVBAsTCklULXNlcnZpY2UxFDASBgNVBAMTC3BsYXkuaGtyLnNlMRswGQYJKoZIhvcNAQkBFgxhZG1pbkBoa3Iuc2WCCQCfMO5fVy3KAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABi8Exz8XRt64P9ilnf3MKAJ2YI+lm70DpYOp5YDiNpfYG4cLA2ki2jmr14jxDM585SkmNKnLuZQ5Mf6zYgbLEQ9qkg0aDLHQ1lX7MclsipEnB3NV2PNAz5zAnYB/RznQN+0HYKo98Jg6T6HfMLZPG6E8DL4bMN0LOc6KfHTP+H9K2t5auNAvks7HCaj4cTVxZkW8OsmI57RXtxvW+k47S7aEO5BsDJdnzs9vFpBWqneECQxhYh8HT7VZwx8WTDxkQ4ofuo97GsX4TprGOTJGBm/DvpcMOFjHk716dES9nS5N0hPV4eBHRVTHAyOKbJQguJBsMaF7mDcjQh0rS5Vyu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hkr.se/user/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hkr.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Högskolan Kristianstad</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Kristianstad</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Kristianstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.hkr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.hkr.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Dan Wirdefalk</md:SurName>
-    <md:EmailAddress>mailto:dan.wirdefalk@hkr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 2fa50a3c..b975daea 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -223,7 +223,6 @@
   <xi:include href="swamid-2.0/www.nais.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/internt.geol.lu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/play.hkr.se.xml"/>
   <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
   <xi:include href="swamid-2.0/account.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml"/>