From c610a045b3056f16d9b12897267b3fa44ea3ba99 Mon Sep 17 00:00:00 2001
From: Fredrik Åslund <fredrik.aslund@umu.se>
Date: Fri, 21 Feb 2014 16:07:31 +0100
Subject: re and hei added to confluence.its.umu.se SWAMIDOPS-7163

---
 swamid-2.0/confluence.its.umu.se-shibboleth.xml |  6 +++++
 swamid-2.0/nagios.nordu.net-8087-sp.xml         | 30 +++++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
index 3263bc45..4b9b32ae 100644
--- a/swamid-2.0/confluence.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
@@ -16,6 +16,12 @@ and do *NOT* provide it in real time to your partners.
     <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>
diff --git a/swamid-2.0/nagios.nordu.net-8087-sp.xml b/swamid-2.0/nagios.nordu.net-8087-sp.xml
index 243c5e09..f828510a 100644
--- a/swamid-2.0/nagios.nordu.net-8087-sp.xml
+++ b/swamid-2.0/nagios.nordu.net-8087-sp.xml
@@ -1,16 +1,38 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<ns0:EntityDescriptor entityID="https://nagios.nordu.net:8087/sp.xml" xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"><ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:KeyDescriptor use="encryption"><ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#"><ns1:X509Data><ns1:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nagios.nordu.net:8087/sp.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:KeyDescriptor use="encryption">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
 WrvKMXfnKt9z7TD7QzsbJFl6UdFDpIesx7UY/pgKE6JYlmOshNtaB5W9y/IP3Hm0
 05FYLYrP3UqHcGTiJ8ULRjH+Vg/eNXZk9aCUgk4f4DBbQGLo6QXWncwKW2CoCtwR
 L//g2DOX1RMVDqJrDQsUvXZjojS1wQ7W3SOLah0Ycc2MEzcRzxotr8dCtgAR/fuf
 sxhZOYN3amGvXw4JBdVC7yaw+HclZNjgQhy+9wzpn8+V+Rx2mJv5CPNVa9oDMi2S
 1MU0QotxufXqUNqZwiQqtYaalWS6my+8iRZs+RMLZFLtXTqEbDWR8+6NJdVXktYe
 xwIDAQAB
-</ns1:X509Certificate></ns1:X509Data></ns1:KeyInfo></ns0:KeyDescriptor><ns0:KeyDescriptor use="signing"><ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#"><ns1:X509Data><ns1:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
+</ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
+        <ns1:X509Data>
+          <ns1:X509Certificate>MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb5Yaoeqw7s3ZDGi720X
 WrvKMXfnKt9z7TD7QzsbJFl6UdFDpIesx7UY/pgKE6JYlmOshNtaB5W9y/IP3Hm0
 05FYLYrP3UqHcGTiJ8ULRjH+Vg/eNXZk9aCUgk4f4DBbQGLo6QXWncwKW2CoCtwR
 L//g2DOX1RMVDqJrDQsUvXZjojS1wQ7W3SOLah0Ycc2MEzcRzxotr8dCtgAR/fuf
 sxhZOYN3amGvXw4JBdVC7yaw+HclZNjgQhy+9wzpn8+V+Rx2mJv5CPNVa9oDMi2S
 1MU0QotxufXqUNqZwiQqtYaalWS6my+8iRZs+RMLZFLtXTqEbDWR8+6NJdVXktYe
 xwIDAQAB
-</ns1:X509Certificate></ns1:X509Data></ns1:KeyInfo></ns0:KeyDescriptor><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087/acs/post" index="1" /><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net:8087/acs/redirect" index="2" /><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net:8087/acs/artifact" index="3" /><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.nordu.net:8087/ecp" index="4" /><ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087" index="5" /></ns0:SPSSODescriptor></ns0:EntityDescriptor>
+</ns1:X509Certificate>
+        </ns1:X509Data>
+      </ns1:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087/acs/post" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nagios.nordu.net:8087/acs/redirect" index="2"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nagios.nordu.net:8087/acs/artifact" index="3"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nagios.nordu.net:8087/ecp" index="4"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nagios.nordu.net:8087" index="5"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
-- 
cgit v1.2.3