restructure local metadata - avoid dupsfidus-metadata-2019-09-13-v02

6 files changed, 2 insertions, 150 deletions

diff --git a/metadata/fidus.fd b/metadata/fidus.fd
index 854f5e4..c187b05 100644
--- a/metadata/fidus.fd
+++ b/metadata/fidus.fd
@@ -20,6 +20,7 @@
     - load:
         - https://mds.swamid.se/md/swamid-registered.xml cleanup remote
         - https://fed.skolfederation.se/trial/md/skolfederation-trial-3_1.xml cleanup remote
+        - /opt/metadata/test-sp cleanup clean via local
         - /opt/metadata/production-idp cleanup clean via local
         - /opt/metadata/production-sp cleanup clean via local
     - select
diff --git a/metadata/production-idp/.placeholder b/metadata/production-idp/.placeholder
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/metadata/production-idp/.placeholder
diff --git a/metadata/production-sp/fidus-test.skolverket.se-sp.xml b/metadata/production-sp/fidus-test.skolverket.se-sp.xml
deleted file mode 100644
index 5503851..0000000
--- a/metadata/production-sp/fidus-test.skolverket.se-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" entityID="https://fidus-test.skolverket.se/sp">
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fidus-test.skolverket.se/Saml2SP/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo>
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFXjCCA0agAwIBAgIJAJX842aaffviMA0GCSqGSIb3DQEBCwUAMEQxEDAOBgNV
-BAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29sdmVya2V0
-MQswCQYDVQQGEwJTRTAeFw0xODExMjYwOTUxNDNaFw0xODEyMjYwOTUxNDNaMEQx
-EDAOBgNVBAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29s
-dmVya2V0MQswCQYDVQQGEwJTRTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALf9eTZK9EOUBAPUEm2Oza6QtHpQT9b3VmTopi+N8d2uBPX9WL+iLhcr3oFJ
-5+1oB5dj9tDkuu2w2g1OWe5amQdyGzr8YibPYbh07ei+s+2oU042FoBaK7gV66Fc
-ai+6/mdc6lrqSmL0SK2w8XzAISTUhia1fVK90CI4PK5+N/u2vzB1ul6c+4dbr7y5
-O7dE6mITouuiGplwrnVjxRqL23vGdt5giefRPf5Djsc2Zl4e9zgnbvjoIdKGdM8F
-KLutiX86sboLXatV5G5TT43KHcxi4AUyxRtX838N+MBNU2kIwD727+S/DgB2F144
-heeW2ST81i2/0HAjuTOj9fDW0bKpZ0bj7JO8HqF1Y4Jkl2Ez5O1/tMM6fo37dT1N
-JtyopZ63dk9B/X/odhr3A1T/c5QIz7C2fhjSBOHX4pRrT1vCMRswxok1oOreTkMK
-wELM9CyNpcMN5x430C/DrRbSXUQ2hLS3l06GzKsjq8B5ewOX8Non5sDR4IULLjXy
-Avvw7hnDcSJQTuxMcIW5aVFIRXH7cvuvKjdXBnTKIsCBGiYCvXsfhw12r9R9DOUN
-g/Z+uMI2tnP2uOcb9QG0NpegQ4wn/exJOVRnm5QCWUHTA8iVVgDHdncU8lPYDqBy
-Kls4pnvod8cqgnoa4ThSmVT/mcvBDSJDvFmxlKJBj3ygLJF5AgMBAAGjUzBRMB0G
-A1UdDgQWBBRenjk70e7YbdeI3KiI+yVv+EE0NjAfBgNVHSMEGDAWgBRenjk70e7Y
-bdeI3KiI+yVv+EE0NjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IC
-AQB6d+FSkQ+CRSEnZjWzeL4yYFdjqzOaqlyPhlEC2O3t/eleN6pNQL9t3S9TdTS0
-PW5vIF0vVz9SkCFV3C+KeBmUSq6RUqp4jYkV/b5ywKSy6FGEH0xHZ13oiOPZGB97
-TRQ0mDU8f3FnchfCx4nOcy4/CaKS0LcDcDYtyAFTVE28o8NvomxuDKrBS1rGiYcw
-1dpKFS8zbYmEnlcavGeg0o5JQ9hyg7ZKn/0Xbif8ma3/imOfN7Q7WqrHImgFjulN
-pqBuLL9ea7fzl6ppakxRu1UsaKkB2uPjpKijjZVuary43+43o5HY7ikzgpkiXe0C
-UbSXx4iFY/ZsOb+gQIJF+9J4kMEViTrEzs8PSyMXIN8BWt48A1Tui5y16YXpzvGU
-Av/068rP2aSmrYanMyVzgxpmjC/dir3pN+MVglZb2475z5IvyGovdlscCONBEB0b
-Ls4KzNser0XQPiEcfsoDlESd0wfPDDH5xVB4pQ11bjgEJEwuWRKb0Py+CiRhsqKU
-CPt3BBSuLvEhcEHoHH1GISRWFpTnjvXRxn8T08a7YUZhZE51Sxc/ER+pUS62EC+p
-GDP6jfZIJzi0D36OOqRn+PViuo9gnjd6q3I3JsEPko74lPYwEvPlnt6llVQ4y6t/
-Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo>
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFXjCCA0agAwIBAgIJAJX842aaffviMA0GCSqGSIb3DQEBCwUAMEQxEDAOBgNV
-BAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29sdmVya2V0
-MQswCQYDVQQGEwJTRTAeFw0xODExMjYwOTUxNDNaFw0xODEyMjYwOTUxNDNaMEQx
-EDAOBgNVBAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29s
-dmVya2V0MQswCQYDVQQGEwJTRTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALf9eTZK9EOUBAPUEm2Oza6QtHpQT9b3VmTopi+N8d2uBPX9WL+iLhcr3oFJ
-5+1oB5dj9tDkuu2w2g1OWe5amQdyGzr8YibPYbh07ei+s+2oU042FoBaK7gV66Fc
-ai+6/mdc6lrqSmL0SK2w8XzAISTUhia1fVK90CI4PK5+N/u2vzB1ul6c+4dbr7y5
-O7dE6mITouuiGplwrnVjxRqL23vGdt5giefRPf5Djsc2Zl4e9zgnbvjoIdKGdM8F
-KLutiX86sboLXatV5G5TT43KHcxi4AUyxRtX838N+MBNU2kIwD727+S/DgB2F144
-heeW2ST81i2/0HAjuTOj9fDW0bKpZ0bj7JO8HqF1Y4Jkl2Ez5O1/tMM6fo37dT1N
-JtyopZ63dk9B/X/odhr3A1T/c5QIz7C2fhjSBOHX4pRrT1vCMRswxok1oOreTkMK
-wELM9CyNpcMN5x430C/DrRbSXUQ2hLS3l06GzKsjq8B5ewOX8Non5sDR4IULLjXy
-Avvw7hnDcSJQTuxMcIW5aVFIRXH7cvuvKjdXBnTKIsCBGiYCvXsfhw12r9R9DOUN
-g/Z+uMI2tnP2uOcb9QG0NpegQ4wn/exJOVRnm5QCWUHTA8iVVgDHdncU8lPYDqBy
-Kls4pnvod8cqgnoa4ThSmVT/mcvBDSJDvFmxlKJBj3ygLJF5AgMBAAGjUzBRMB0G
-A1UdDgQWBBRenjk70e7YbdeI3KiI+yVv+EE0NjAfBgNVHSMEGDAWgBRenjk70e7Y
-bdeI3KiI+yVv+EE0NjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IC
-AQB6d+FSkQ+CRSEnZjWzeL4yYFdjqzOaqlyPhlEC2O3t/eleN6pNQL9t3S9TdTS0
-PW5vIF0vVz9SkCFV3C+KeBmUSq6RUqp4jYkV/b5ywKSy6FGEH0xHZ13oiOPZGB97
-TRQ0mDU8f3FnchfCx4nOcy4/CaKS0LcDcDYtyAFTVE28o8NvomxuDKrBS1rGiYcw
-1dpKFS8zbYmEnlcavGeg0o5JQ9hyg7ZKn/0Xbif8ma3/imOfN7Q7WqrHImgFjulN
-pqBuLL9ea7fzl6ppakxRu1UsaKkB2uPjpKijjZVuary43+43o5HY7ikzgpkiXe0C
-UbSXx4iFY/ZsOb+gQIJF+9J4kMEViTrEzs8PSyMXIN8BWt48A1Tui5y16YXpzvGU
-Av/068rP2aSmrYanMyVzgxpmjC/dir3pN+MVglZb2475z5IvyGovdlscCONBEB0b
-Ls4KzNser0XQPiEcfsoDlESd0wfPDDH5xVB4pQ11bjgEJEwuWRKb0Py+CiRhsqKU
-CPt3BBSuLvEhcEHoHH1GISRWFpTnjvXRxn8T08a7YUZhZE51Sxc/ER+pUS62EC+p
-GDP6jfZIJzi0D36OOqRn+PViuo9gnjd6q3I3JsEPko74lPYwEvPlnt6llVQ4y6t/
-Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fidus-test.skolverket.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fidus-test.skolverket.se/Saml2SP/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">Skolverket</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">Skolverket</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://www.skolverket.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>daniel.robles@skolverket.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>daniel.robles@skolverket.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/metadata/production-sp/provplattformen-pre.skolverket.se.xml b/metadata/production-sp/provplattformen-pre.skolverket.se.xml
deleted file mode 100644
index e338dc9..0000000
--- a/metadata/production-sp/provplattformen-pre.skolverket.se.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://provplattformen-pre.skolverket.se">
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://provplattformen-pre.skolverket.se/logout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://provplattformen-pre.skolverket.se/acs" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/metadata/production-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/metadata/production-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
deleted file mode 100644
index 01177c3..0000000
--- a/metadata/production-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Skolverket Assessment Master - UAT</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
-        <mdui:Logo width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>SoNET Systems</md:Company>
-    <md:GivenName>Software</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>software@sonet.com.au</md:EmailAddress>
-    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/test-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/metadata/test-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
index 01177c3..39395cf 100644
--- a/metadata/test-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/metadata/test-sp/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -26,7 +26,7 @@
     <md:Company>SoNET Systems</md:Company>
     <md:GivenName>Software</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>software@sonet.com.au</md:EmailAddress>
+    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
     <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>