From 3e94fd8f89b5da417afe697f7bb9365e80c058cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Wed, 6 Feb 2008 13:23:57 +0000
Subject: [PATCH] Tidy up the metadata-templates

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@255 44740490-163a-0410-bde0-09ae8108e29a
---
 metadata-templates/saml20-idp-remote.php | 15 +++++++++++-
 metadata-templates/saml20-sp-hosted.php  |  4 ++--
 metadata-templates/shib13-idp-remote.php | 29 ++++++------------------
 metadata-templates/shib13-sp-hosted.php  |  4 ++--
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/metadata-templates/saml20-idp-remote.php b/metadata-templates/saml20-idp-remote.php
index 1f3851219..63dcb3687 100644
--- a/metadata-templates/saml20-idp-remote.php
+++ b/metadata-templates/saml20-idp-remote.php
@@ -10,10 +10,23 @@
 
 $metadata = array( 
 
+
+	/*
+	 * Example simpleSAMLphp SAML 2.0 IdP
+	 */
+	'idp-entity-id-simple' =>  array(
+		'name'                 => 'Test',
+		'description'          => 'Description of this example entry',
+		
+		'SingleSignOnService'  => 'https://idp.example.org/simplesaml/saml2/idp/SSOService.php',
+		'SingleLogoutService'  => 'https://idp.example.org/simplesaml/saml2/idp/SingleLogoutService.php',
+		'certFingerprint'      => '3fa158e8abfd4b5203315b08c0b791b6ee4715f6'
+	),
+
 	/*
 	 * Example simpleSAMLphp SAML 2.0 IdP
 	 */
-	'idp.example.org' =>  array(
+	'idp-entity-id' =>  array(
 		'name'					=>	'Test',
 		'description'			=> 'Description of this example entry',
 		
diff --git a/metadata-templates/saml20-sp-hosted.php b/metadata-templates/saml20-sp-hosted.php
index 4a38eef75..b540d2676 100644
--- a/metadata-templates/saml20-sp-hosted.php
+++ b/metadata-templates/saml20-sp-hosted.php
@@ -19,7 +19,7 @@
  *
  *  - 'request.signing' => true,
  *  - 'privatekey' => 'server.pem',
- *  - 'certificate' => 'server.pem',
+ *  - 'certificate' => 'server.crt',
  */
  
 $metadata = array( 
@@ -28,7 +28,7 @@ $metadata = array(
 	 * Example of a hosted SP 
 	 */
 	'sp-entityid' => array(
-		'host'  => 'sp.example.org'
+		'host'  => 'sp.example.org'		
 	)
 
 );
diff --git a/metadata-templates/shib13-idp-remote.php b/metadata-templates/shib13-idp-remote.php
index 0d10e0ac7..f5ad171d6 100644
--- a/metadata-templates/shib13-idp-remote.php
+++ b/metadata-templates/shib13-idp-remote.php
@@ -1,32 +1,17 @@
 <?php
-/* 
+/** 
  * SAML 2.0 Meta data for simpleSAMLphp
  *
+ *
+ *
+ *
  */
 
 
 $metadata = array(
-
-
-	'urn:mace:switch.ch:aaitest:dukono.switch.ch'	=> array(
-		'SingleSignOnService'		=>	'https://dukono.switch.ch/shibboleth-idp/SSO',
-		'certFingerprint'		=>	'c7279a9f28f11380509e075441e3dc55fb9ab864' 
-	),
-	
-
-	'hbe.edugain.bridge.feide.no'	=> array(
-		'SingleSignOnService'		=>	'https://hbe.edugain.bridge.feide.no/simplesaml/shib13/idp/SSOService.php',
-		'certFingerprint'		=>	'afe71c28ef740bc87425be13a2263d37971da1f9' 
-	),
-	
-	'urn:mace:switch.ch:aaitest:dukono.switch.ch'	=> array(
-		'SingleSignOnService'		=>	'https://dukono.switch.ch/shibboleth-idp/SSO',
-		'certFingerprint'		=>	'c7279a9f28f11380509e075441e3dc55fb9ab864' 
-	),
-		
-	'urn:mace:dfnwayf'	=> array(
-		'SingleSignOnService'		=>	'https://dfn.wayf.com/WAYF',
-		'certFingerprint'		=>	'---' 
+	'theproviderid-of-the-idp'	=> array(
+		'SingleSignOnService'  => 'https://idp.example.org/shibboleth-idp/SSO',
+		'certFingerprint'      => 'c7279a9f28f11380509e072441e3dc55fb9ab864' 
 	)
 );
 
diff --git a/metadata-templates/shib13-sp-hosted.php b/metadata-templates/shib13-sp-hosted.php
index 0f94bba10..b61f4c867 100644
--- a/metadata-templates/shib13-sp-hosted.php
+++ b/metadata-templates/shib13-sp-hosted.php
@@ -9,8 +9,8 @@ $metadata = array(
 	/*
 	 * Example of hosted Shibboleth 1.3 SP.
 	 */
-	'sp.example.org'	=> array(
-		'host'						=>	'sp.example.org'
+	'sp-provider-id' => array(
+		'host' => 'sp.example.org'
 	)
 
 );
-- 
GitLab