jira.its.umu.se added

confluence.its.umu.se added

2 files changed, 2 insertions, 81 deletions

diff --git a/swamid-2.0/jira-confluence.its.umu.se-shibboleth.xml b/swamid-2.0/jira-confluence.its.umu.se-shibboleth.xml
deleted file mode 100644
index 41793d80..00000000
--- a/swamid-2.0/jira-confluence.its.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jira-confluence.its.umu.se/shibboleth">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://www.swamid.se/category/hei-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 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://confluence.its.umu.se/Shibboleth.sso/DS/ds.swamid.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://confluence.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Jira och Confluence på ITS, Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jira and Confluence at ITS, Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Projektstöd på ITS</mdui:Description>
-        <mdui:Description xml:lang="en">Project support system at ITS</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>jira-confluence.its.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=jira-confluence.its.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJANANTmUUPjEwMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGmppcmEtY29uZmx1ZW5jZS5pdHMudW11LnNlMB4XDTEzMDgxNTA1NTcxNloX
-DTIzMDgxMzA1NTcxNlowJTEjMCEGA1UEAxMaamlyYS1jb25mbHVlbmNlLml0cy51
-bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtbJysWzyFP5Br
-IO8hMNjwARMQcNKErQBjlOm+ZZx/dFKLMPwxdpOlwvwFDcHnn+AohVM5dUygkFwk
-vGciClOR6QCnnubp93rvjZHVTGRJ5ZlzraVCOCl5lUkKSNIzCqDGfCbvyRvHcg1t
-bGBVJJbwWbXaqb3ZT/p2OI7+XP9uTzazIkDNbA9JL6xjRBnE2AljfCnmKTrS81Su
-/x7lmG+4Ji/H37jcJAdbtda05t2ARURwFKIXFIYr8CJklCTAxnh+T5qaV4n8apq/
-AceIfYiTc8FYlK9ptMkEFy2VkyQm/9Q+RU5ZDHLqPzqWnwDlx4kjnyWRBaB63zOY
-Re+R2A2nAgMBAAGjSDBGMCUGA1UdEQQeMByCGmppcmEtY29uZmx1ZW5jZS5pdHMu
-dW11LnNlMB0GA1UdDgQWBBTQvicuhivjhvST66h9a8LuowqZMDANBgkqhkiG9w0B
-AQUFAAOCAQEAMwQCeECnIAKZTd4mwWumokjmTEHaPR7njWVHsIdJZ36pKv9eIYZ+
-VAddlrhUH7LoQF0RgxkN4zoAlyDYlmcdVtmA58WAPdUFxziMznSGsV4MKrWZosIa
-iYMLbcnsX7O3TJydO9nZZf8X7MWOMPHLEHB8+cInXHnAZqT+kZOiACJ5MQr4oSk4
-ABpmWvKs9qsEa0DqR7wnaV4f3fS3xwbwTUb25v4ATi9vi5wkIUJwatVMNvJV4g/B
-db1zTPxnsz/JyD/9EGp3qd1utQPgn1XZv+wDtIJwQ+8Kx31za5Cxnc7bxP2yhitT
-kcpkPw96Zj9HfRw2XGwo0pM+nRwYuw9WpA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 3f8f000c..e9eab4ff 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -82,7 +82,8 @@
    <xi:include href="swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
    <xi:include href="swamid-2.0/wiki.edugain.org-shibboleth.xml"/>
    <xi:include href="swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml"/>
-   <xi:include href="swamid-2.0/jira-confluence.its.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/confluence.its.umu.se-shibboleth.xml"/>
+   <xi:include href="swamid-2.0/jira.its.umu.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
    <xi:include href="swamid-2.0/se.timeedit.net-umu-employee-sp.xml"/>
    <xi:include href="swamid-2.0/se.timeedit.net-umu-student-sp.xml"/>