From cdc88395157349c1d0aef8c2fd5c9ffbd25364a8 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Tue, 21 Sep 2021 16:37:19 +0200
Subject: Added stats2.inacademia.org + updated stats.inacademia.org

---
 ...-module.php-saml-sp-metadata.php-default-sp.xml | 17 ++++++
 ...-module.php-saml-sp-metadata.php-default-sp.xml | 69 ++++++++++++++++++++++
 swamid-sp-2.0.mxml                                 |  1 +
 3 files changed, 87 insertions(+)
 create mode 100644 swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml

diff --git a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index f1a33e28..811c7c4c 100644
--- a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -14,6 +14,12 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="en">inacademia affiliation+validation</mdui:Keywords>
         <mdui:Logo width="280" height="72" xml:lang="en">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">InAcademia stats portal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">The stats portal for InAcademia</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://inacademia.org</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">inacademia affiliation+validation</mdui:Keywords>
+        <mdui:Logo width="280" height="72" xml:lang="sv">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -38,9 +44,16 @@
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">InAcademia</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://inacademia.org</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>InAcademia</md:GivenName>
     <md:SurName>Support</md:SurName>
@@ -50,4 +63,8 @@
     <md:GivenName>InAcademia Technical Support</md:GivenName>
     <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>InAcademia Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..4155a90f
--- /dev/null
+++ b/swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,69 @@
+<?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://stats2.inacademia.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-09-21T16:36:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <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">InAcademia stats qa-portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The stats qa-portal for InAcademia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://inacademia.org</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">inacademia affiliation+validation</mdui:Keywords>
+        <mdui:Logo width="280" height="72" xml:lang="en">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">InAcademia stats qa-portal</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">The stats qa-portal for InAcademia</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://inacademia.org</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://inacademia.org/privacy-and-data-protection/</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">inacademia affiliation+validation</mdui:Keywords>
+        <mdui:Logo width="280" height="72" xml:lang="sv">https://inacademia.org/wp-content/uploads/2017/02/inacademia_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAJaFV40ZWU9XMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzAeFw0xOTA5MjgxMzA1MzNaFw0yOTA5MjUxMzA1MzNaMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6lTNVNJ8FF5/4NR93E8xSPtKWF5mNMnxIBkukS0elZOhRWzR2FetfHG/9vovbwfCKLn0+pSs/o3Gj9nceVbCbZN5oA7WyI02BOVTf2GVcQ5HADBPdPJWsduatmYxxTb5MOTgld1f9gjGxO4s6yhO7RWXfE/NVNLJWR0wEQp8xnTVRarrgDJFRMJqQ+8Ezkr2oHpjUAPoZSmLKm7t7/QR/ekHsfLZr0lWmi4TaIps3SspyNo9ty4s6AZFX7BvzQ4PRByqxZTYXwrzuT41dN3D2gXSG0oRJB9YrrTy8dWBZXADNKhtpSkZiril3g0j7lCiZ+yIkiVkzZ9ew7j11vV38CAwEAAaNQME4wHQYDVR0OBBYEFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMB8GA1UdIwQYMBaAFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI3BIeABs8IIWBkI3uevKVc2zsScAmJgwq89k6iApTAvt233a7u9X7V8jXJ3dmXWxWm18J7HxIqK9r/s+TXF9rCTsjUptycIKzlLqBDkHKDIebNFPSoFLcIE3yy6d5OVdnwzZRXywi2cbwpWZy5ap+nFH0ObhN1WpH3zCK38ylJmQ2DQ/n2oim8B43dxHtQ9pjy71jHEcK5qeKee2mCUx+sVtnJmae66QLGg4FBhOb39/AvRd+/lH5Y1Fs8D2ukxNhvl2MyifIRu68GM0SOyp+DiktlBJ+lgVtIJU9Fckd7YH9BhDlRvhJ0blNuZgaqTZMTBds8isVTOLLhB8N11v8I=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAJaFV40ZWU9XMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzAeFw0xOTA5MjgxMzA1MzNaFw0yOTA5MjUxMzA1MzNaMIGRMQswCQYDVQQGEwJTRTETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU3RvY2tob2xtMRMwEQYDVQQKDApJbkFjYWRlbWlhMR0wGwYDVQQDDBRzdGF0cy5pbmFjYWRlbWlhLm9yZzElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBpbmFjYWRlbWlhLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6lTNVNJ8FF5/4NR93E8xSPtKWF5mNMnxIBkukS0elZOhRWzR2FetfHG/9vovbwfCKLn0+pSs/o3Gj9nceVbCbZN5oA7WyI02BOVTf2GVcQ5HADBPdPJWsduatmYxxTb5MOTgld1f9gjGxO4s6yhO7RWXfE/NVNLJWR0wEQp8xnTVRarrgDJFRMJqQ+8Ezkr2oHpjUAPoZSmLKm7t7/QR/ekHsfLZr0lWmi4TaIps3SspyNo9ty4s6AZFX7BvzQ4PRByqxZTYXwrzuT41dN3D2gXSG0oRJB9YrrTy8dWBZXADNKhtpSkZiril3g0j7lCiZ+yIkiVkzZ9ew7j11vV38CAwEAAaNQME4wHQYDVR0OBBYEFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMB8GA1UdIwQYMBaAFCEQEeVdAf9/CEIiq0Tl6wwrNlAUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAI3BIeABs8IIWBkI3uevKVc2zsScAmJgwq89k6iApTAvt233a7u9X7V8jXJ3dmXWxWm18J7HxIqK9r/s+TXF9rCTsjUptycIKzlLqBDkHKDIebNFPSoFLcIE3yy6d5OVdnwzZRXywi2cbwpWZy5ap+nFH0ObhN1WpH3zCK38ylJmQ2DQ/n2oim8B43dxHtQ9pjy71jHEcK5qeKee2mCUx+sVtnJmae66QLGg4FBhOb39/AvRd+/lH5Y1Fs8D2ukxNhvl2MyifIRu68GM0SOyp+DiktlBJ+lgVtIJU9Fckd7YH9BhDlRvhJ0blNuZgaqTZMTBds8isVTOLLhB8N11v8I=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats2.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">InAcademia</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">InAcademia</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://inacademia.org</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>InAcademia</md:GivenName>
+    <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>InAcademia Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>InAcademia Technical Support</md:GivenName>
+    <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8c0620fc..c39ab276 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -698,4 +698,5 @@
   <xi:include href="swamid-2.0/agate.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/stats2.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3