summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swamid-1.0.mxml1
-rw-r--r--swamid-1.0/shibboleth.slu.se.xml7
-rw-r--r--swamid-idp-2.0.mxml1
3 files changed, 6 insertions, 3 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 04a42616..1f87b493 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -174,6 +174,7 @@
<xi:include href="swamid-1.0/play.liu.se.xml"/>
<xi:include href="swamid-1.0/account.liu.se.xml"/>
<xi:include href="swamid-1.0/shibboleth.slu.se.xml"/>
+ <xi:include href="swamid-2.0/idp2-1.slu.se.xml"/>
<xi:include href="swamid-1.0/nagios-vm.nordu.net.xml"/>
<xi:include href="swamid-1.0/amiga.kib.ki.se.xml"/>
<xi:include href="swamid-1.0/www.universityadmissions.se-aws-sp-en.xml"/>
diff --git a/swamid-1.0/shibboleth.slu.se.xml b/swamid-1.0/shibboleth.slu.se.xml
index d757ebb7..c2e82c34 100644
--- a/swamid-1.0/shibboleth.slu.se.xml
+++ b/swamid-1.0/shibboleth.slu.se.xml
@@ -71,9 +71,10 @@ xpmbgA==</ds:X509Certificate>
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
</AttributeAuthorityDescriptor>
<Organization>
- <OrganizationName xml:lang="en">SLU</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.slu.se</OrganizationURL>
+ <OrganizationName xml:lang="en">Swedish University of Agricultural Science</OrganizationName>
+ <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (OLD)</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (OLD)</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.slu.se/en/</OrganizationURL>
</Organization>
<ContactPerson contactType="technical">
<GivenName>Martin</GivenName>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 33cf6fcc..33c83152 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -12,6 +12,7 @@
<xi:include href="swamid-1.0/login.du.se.xml"/>
<xi:include href="swamid-1.0/idp.mah.se.xml"/>
<xi:include href="swamid-1.0/shibboleth.slu.se.xml"/>
+ <xi:include href="swamid-2.0/idp2-1.slu.se.xml"/>
<xi:include href="swamid-1.0/login.liu.se.xml"/>
<xi:include href="swamid-1.0/shibbo.ltu.se.xml"/>
<xi:include href="swamid-1.0/idp.hkr.se.xml"/>