SWAMID-217, Ny adfs server Naturhistoriska riksmuseet

4 files changed, 9 insertions, 81 deletions

diff --git a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
deleted file mode 100644
index 995e7544..00000000
--- a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,75 +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="http://adfs.nrm.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml: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-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.nrm.se/adfs/services/trust">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Naturhistoriska riksmuseet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Museum of Natural History</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitstjänst för anställda vid Naturhistoriska riksmuseet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees at Swedish Museum of Natural History</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.nrm.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.nrm.se/en/16.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="76" width="88">https://www.nrm.se/images/18.33f35f55112e1f929a580001275/1367709414980/Logga.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="76" width="88">https://www.nrm.se/images/18.33f35f55112e1f929a580001275/1367709414980/Logga.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQZcgpIT1y9YVHkSdazFD+WzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBhZGZzLm5ybS5zZTAeFw0xOTAyMjgxMTIyMzhaFw0yMDAyMjgxMTIyMzhaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGFkZnMubnJtLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv4WtFd5fR6lWUS5sZg2St1Cgsws9b/al+zM4Kbz4tXavrDhiG94vDOpVc6dUvZ7GXFMCtP+UoIfPSpWWwuFrhx7JrlfH5Qolxt5/vFpmbWg41w7NkrgBeeSYCscC/3rP1vFITiWnJZKVG53k1yrVdlz5S6jNI1Y+d5KJdWCvr4u60jsNUPWt5yqmHAaVRLGX5kaZbmdZC2yqDb0nKmwiTTG+jZOJq0SSilMVNpJda4kjZu1EW5I84TlunHmFf56v3CryKYbzrRhAvzXJitGchNVrUhwywivA6YTl72u0k44vKPApVfoZXwuKv0P4o8cV1fgPAQYS5mwQEMmHiLlD4wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCtufzRfu0P+zQJTIeTA883R7lWCYLfty+BhRIWj6IccPhMStQY854iFWXWY3zJsxvgBpXkvJhQ/W1Z4XlGdF/ayfj0IUGKvdK67/eBGqfQTS79MKR9CqG1phpGO0dk8U/mTvEMInr5om2rLaPQzwGTGXUxlogZciL+50hmMezSQeptVkVSSaVgdXIEumZSXjjZKTu0Hy/nkMi2wLy4Wa82zDgyXqwPEdF3aOaAkD456EYbBpIva1gHYrnkDafi6/aeHAXh8gAKBmcxQB9ou3ml4YJGi/hblJgAq7yRPkqvtR+EH6o1ufDzM5W+NxgUiDt6duf5SnAVqVbEvGY8owXW</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQVCvsRARIW6hDxO1UwRw3mzANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBhZGZzLm5ybS5zZTAeFw0xOTAyMjgxMTIyMzlaFw0yMDAyMjgxMTIyMzlaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGFkZnMubnJtLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlpJnnfmSGNQb22BCp/r3D6Ndl0YtvXZOyPQjU9eaV0/UrYGmFz6rSalzbVbwGw4ZrL8mjjB2Ldg5CiFGLTdkJAogJ/51WoAazlfo1/ucw924Sv9wqlA+drfENv5tSdIUXw4S/VQMrLpbpH2Dg4iVbawJNCImh1njJT90xtSXqCoV8sld5S2tO31MGDOmNiC7QqzFTfNXFQK/r0F0/wF07kjL4iX33t2+Qmk3naM4OdtxZ0zlIGy8xwu66RTBL0jvJn7D7yS1Rp69kkvYjexu2pDOJ/y3+1S3Gz8bp6UJtf+4/Ah/CzLeQ5RBpZ8NIJnl6f/MXsMhzqJjAIjaHFy8wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB4wiNEDKtC0NDj64fy2NWjjjbEiy5vuoHvFz2YqDkapF8l5pBtpuorsAEyEFiG5Uq3ke/0cZ9abWeFIx1H3f7opXelDS+au1MizUeAEj2RBXZO/g8JfsSe6LzXQoPB+jBzAAUop0R6h4xnmbrwJCab+Mi/TAJxpsXdqFEYE8iuCiHqCHf85+kGfMaqpDiR3mPoAuO8tP4lp96Dct1s9l3Vv8UBXwDJwcU/pKo193uDeyfe5iz6OddpKkH4p7zV9RXwvfFVN3i5mXByVh4RYn9v3mxgn+574AEHJVkxIsY+rbvPbOrp5t5/ElWj8cNL65d7kzBoPeZ6Brl3/P4xy4uT</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.nrm.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.nrm.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.nrm.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.nrm.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationName>
-    <OrganizationName xml:lang="en">Swedish Museum of Natural History</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Museum of Natural History</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.nrm.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.nrm.se/en/16.html</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Naturhistoriska riksmuseet</Company>
-    <SurName>Användarsupport</SurName>
-    <EmailAddress>mailto:support@nrm.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Naturhistoriska riksmuseet</Company>
-    <SurName>System administration</SurName>
-    <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Naturhistoriska riksmuseet</Company>
-    <SurName>System administration</SurName>
-    <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
index 8f99d4a4..1d429c2a 100644
--- a/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.nrm.se-adfs-services-trust.xml
@@ -8,15 +8,19 @@
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
       </saml: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-support">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.nrm.se/adfs/services/trust">
     <Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Naturhistoriska riksmuseet - NEW</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Museum of Natural History - NEW</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitstjänst för anställda vid Naturhistoriska riksmuseet - NEW</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees at Swedish Museum of Natural History - NEW</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">Naturhistoriska riksmuseet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Swedish Museum of Natural History</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identitstjänst för anställda vid Naturhistoriska riksmuseet</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for employees at Swedish Museum of Natural History</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.nrm.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.nrm.se/en/16.html</mdui:InformationURL>
         <mdui:Logo xml:lang="sv" height="76" width="88">https://www.nrm.se/images/18.33f35f55112e1f929a580001275/1367709414980/Logga.gif</mdui:Logo>
diff --git a/swamid-edugain-idp-1.0.mxml b/swamid-edugain-idp-1.0.mxml
index 4f573cb0..8d46926c 100644
--- a/swamid-edugain-idp-1.0.mxml
+++ b/swamid-edugain-idp-1.0.mxml
@@ -44,7 +44,7 @@
   <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.umu.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/adfs.nrm.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/fs.nrm.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml"/>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 7e43ad48..b7bbbc15 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -14,6 +14,5 @@
   <xi:include href="swamid-2.0/adfs.kb.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/swamid.vr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/fs.bth.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/fs.nrm.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/fs.uka.se-adfs-services-trust.xml"/>
 </md:EntitiesDescriptor>