From edd1fac2145f2e27ab822361e0e6e9cdff8654d9 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 18 Jan 2017 23:09:57 +0100
Subject: Resolved SWAMIDOPS-8450

---
 swamid-2.0/dbh-prod.i.uhr.se-shibboleth.xml | 100 ----------------------------
 swamid-2.0/dbhprod.uhr.se-shibboleth.xml    | 100 ++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                          |   2 +-
 3 files changed, 101 insertions(+), 101 deletions(-)
 delete mode 100644 swamid-2.0/dbh-prod.i.uhr.se-shibboleth.xml
 create mode 100644 swamid-2.0/dbhprod.uhr.se-shibboleth.xml

diff --git a/swamid-2.0/dbh-prod.i.uhr.se-shibboleth.xml b/swamid-2.0/dbh-prod.i.uhr.se-shibboleth.xml
deleted file mode 100644
index 1cb972af..00000000
--- a/swamid-2.0/dbh-prod.i.uhr.se-shibboleth.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dbh-prod.i.uhr.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#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <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/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Test av ny produktionssite för Bedömningshandboken (kommer att få denna URL vid driftsättning: bedomningshandboken.uhr.se)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Test of new production site for Bedömningshandboken (will get this URL when released: bedomningshandboken.uhr.se)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test av Bedömningshandboken</mdui:Description>
-        <mdui:Description xml:lang="en">Test of Bedömningshandboken</mdui:Description>
-      </mdui:UIInfo>
-      <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://dbh-prod.i.uhr.se/Shibboleth.sso/Login"/>
-      <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://dbh-prod.i.uhr.se/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>uhrepiweb02.i.uhr.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrepiweb02.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEAzCCAmugAwIBAgIJAOdBqacZ4/EFMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMTFHVocmVwaXdlYjAyLmkudWhyLnNlMB4XDTE3MDExMTEyMTgyMloXDTI3MDEw
-OTEyMTgyMlowHzEdMBsGA1UEAxMUdWhyZXBpd2ViMDIuaS51aHIuc2UwggGiMA0G
-CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDv6EgQw6o9Umqd16VMHb3PBMYw+bxy
-2dGv2EPMYAFHjMpythOVvyTrXtA9dgB1Zww77yysuvE5s5+3bEuiZywKtlJ3pWPd
-tn59T8dl85MOorrq0RzKHcXCDF6s7tMTdcV8M4sBC/H9aGmKnHgm0Y617rgfGv5P
-muilDwvktEqafohLce08DZEMWGJBh9jUSEZ/S/Wn7PO1GBX2QA9oHotZAqevR06v
-YaffEG0kEIrQt64uhF0bSBZCfhp0J+SBMk0Wvsma2ckpZ7eRUcET9h7LKn71KIJ8
-1sCocpbn+3JDzhD2uBiYyQaR15Ijfdq8iqfbkX+hmPm0D5/wU3gpuPKuG1UHsAmE
-kEsDPifSFJSbgTLVw+vFFBXqKA+/hWidtLgP4XVNgFI1GB8J5Ly+fMn2bXfH8CwH
-HpffzdGNznYiY0WeJX+lsw9dVFIaCrn5PTZiT0jC+kFvP856UE18QbkL1emi8WrJ
-ptrarp52vCoklBE3zHyJ+rjaKR/zVUKZldUCAwEAAaNCMEAwHwYDVR0RBBgwFoIU
-dWhyZXBpd2ViMDIuaS51aHIuc2UwHQYDVR0OBBYEFOfeY2rg/PgZ2fgEOk2v2x0w
-VnSXMA0GCSqGSIb3DQEBCwUAA4IBgQAGwaIX03w9j4Zm0bIne3Elo/3WVCVdZOev
-ZIX6tq2Fio3+YpnAH+L3sO0FROTRGuxUusJOUWnYJDcVIHOfgzUU0eTa9o/S+fdG
-XNKSeNizrBhvYIRxqhY4tyXhQrp2gEQyUR6LT9rA+X5yYMlrajp2M/Kav1/2sfF4
-EKRAkrCY2eU0ZeI5JwaopzwMYiKxpyoqipUPqFu28xabijrGx6vgbzEfT42Bz7lg
-Q3WUc+tUWPyL9fqGw0FZySSQwks95fXZlQezu1kKHDiptiX2u8lfW3aPbT2PC7ek
-CwsF12e85+5pzfygrHWG9A+hKv49Dt6uTYnYrnv0aQRvAXOwUQ6ZIwKVy3/IISuM
-PI0Bmb7LkjvTr24EPa24S6YMvD+utfgh+MjSnA5lHdDvTtZheoqyoI5haeQ5MMI5
-LKZPDKEVmUXoIJA24fs/pj0RL5nBDYiRobwK1TpM633Ae+NhPDqD0o1JdgPUV3Vg
-GCB2r29GXIAUYaUyAdsWXNMFG6lb7IM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dbh-prod.i.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbh-prod.i.uhr.se/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Erik</md:GivenName>
-    <md:SurName>Jonsson</md:SurName>
-    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/dbhprod.uhr.se-shibboleth.xml b/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
new file mode 100644
index 00000000..54f8d5a8
--- /dev/null
+++ b/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dbhprod.uhr.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#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <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/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Test av ny produktionssite för Bedömningshandboken (kommer att få denna URL vid driftsättning: bedomningshandboken.uhr.se)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Test of new production site for Bedömningshandboken (will get this URL when released: bedomningshandboken.uhr.se)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test av Bedömningshandboken</mdui:Description>
+        <mdui:Description xml:lang="en">Test of Bedömningshandboken</mdui:Description>
+      </mdui:UIInfo>
+      <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://dbhprod.uhr.se/Shibboleth.sso/Login"/>
+      <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://dbhprod.uhr.se/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uhrepiweb02.i.uhr.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uhrepiweb02.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEAzCCAmugAwIBAgIJAOdBqacZ4/EFMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
+BAMTFHVocmVwaXdlYjAyLmkudWhyLnNlMB4XDTE3MDExMTEyMTgyMloXDTI3MDEw
+OTEyMTgyMlowHzEdMBsGA1UEAxMUdWhyZXBpd2ViMDIuaS51aHIuc2UwggGiMA0G
+CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDv6EgQw6o9Umqd16VMHb3PBMYw+bxy
+2dGv2EPMYAFHjMpythOVvyTrXtA9dgB1Zww77yysuvE5s5+3bEuiZywKtlJ3pWPd
+tn59T8dl85MOorrq0RzKHcXCDF6s7tMTdcV8M4sBC/H9aGmKnHgm0Y617rgfGv5P
+muilDwvktEqafohLce08DZEMWGJBh9jUSEZ/S/Wn7PO1GBX2QA9oHotZAqevR06v
+YaffEG0kEIrQt64uhF0bSBZCfhp0J+SBMk0Wvsma2ckpZ7eRUcET9h7LKn71KIJ8
+1sCocpbn+3JDzhD2uBiYyQaR15Ijfdq8iqfbkX+hmPm0D5/wU3gpuPKuG1UHsAmE
+kEsDPifSFJSbgTLVw+vFFBXqKA+/hWidtLgP4XVNgFI1GB8J5Ly+fMn2bXfH8CwH
+HpffzdGNznYiY0WeJX+lsw9dVFIaCrn5PTZiT0jC+kFvP856UE18QbkL1emi8WrJ
+ptrarp52vCoklBE3zHyJ+rjaKR/zVUKZldUCAwEAAaNCMEAwHwYDVR0RBBgwFoIU
+dWhyZXBpd2ViMDIuaS51aHIuc2UwHQYDVR0OBBYEFOfeY2rg/PgZ2fgEOk2v2x0w
+VnSXMA0GCSqGSIb3DQEBCwUAA4IBgQAGwaIX03w9j4Zm0bIne3Elo/3WVCVdZOev
+ZIX6tq2Fio3+YpnAH+L3sO0FROTRGuxUusJOUWnYJDcVIHOfgzUU0eTa9o/S+fdG
+XNKSeNizrBhvYIRxqhY4tyXhQrp2gEQyUR6LT9rA+X5yYMlrajp2M/Kav1/2sfF4
+EKRAkrCY2eU0ZeI5JwaopzwMYiKxpyoqipUPqFu28xabijrGx6vgbzEfT42Bz7lg
+Q3WUc+tUWPyL9fqGw0FZySSQwks95fXZlQezu1kKHDiptiX2u8lfW3aPbT2PC7ek
+CwsF12e85+5pzfygrHWG9A+hKv49Dt6uTYnYrnv0aQRvAXOwUQ6ZIwKVy3/IISuM
+PI0Bmb7LkjvTr24EPa24S6YMvD+utfgh+MjSnA5lHdDvTtZheoqyoI5haeQ5MMI5
+LKZPDKEVmUXoIJA24fs/pj0RL5nBDYiRobwK1TpM633Ae+NhPDqD0o1JdgPUV3Vg
+GCB2r29GXIAUYaUyAdsWXNMFG6lb7IM=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <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://dbhprod.uhr.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dbhprod.uhr.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbhprod.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/POST" index="10"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/Artifact" index="11"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Erik</md:GivenName>
+    <md:SurName>Jonsson</md:SurName>
+    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 79af73e5..56ffb3fa 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -632,5 +632,5 @@
   <xi:include href="swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml"/>
   <xi:include href="swamid-2.0/test.account.hj.se-adfs-services-trust.xml"/>
-  <xi:include href="swamid-2.0/dbh-prod.i.uhr.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/dbhprod.uhr.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3