Adapted default config files

IDProvider.conf.dist.php

@@ -19,22 +19,27 @@ $IDProviders['university'] = array (
 );
 
 
-// Example of a Kerberos-enabled Identity Provider
-$IDProviders['bristol.ac.uk'] = array (
-		'Type' => 'university',
-		'Name' => 'University of Bristol',
-		'SSO' => 'https://sso.bris.ac.uk/sso/index.jsp',
-		'Realm' => 'ADS.BRIS.AC.UK',
-		'en' => array ('Keywords' => 'Bristol South+West+England'),
+$IDProviders['https://idp.epfl.ch/idp/shibboleth'] = array(
+        'SSO' => 'https://idp.epfl.ch/idp/profile/Shibboleth/SSO',
+        'Name' => 'EPF Lausanne',
+        'Type' => 'university',
 );
 
-// Example with optional network blocks that can be used as an 
-// additional IdP preselection hint
-$IDProviders['aitta.funet.fi'] = array (
-		'Type' => 'university',
-		'Name' => 'Tampere University of Technology',
-		'SSO' => 'https://idp.tut.fi/shibboleth-idp/SSO',
-		'IP' => array ('193.166.2.0/24','130.233.0.0/16'),
+$IDProviders['https://aai-logon.ethz.ch/idp/shibboleth'] = array(
+        'SSO' => 'https://aai-logon.ethz.ch/idp/profile/Shibboleth/SSO',
+        'Name' => 'ETH Zürich',
+        'de' => array ('Name' => 'ETH Zürich'),
+        'en' => array ('Name' => 'ETH Zurich'),
+        'Type' => 'university',
+	'IP' => array ('193.166.2.0/24','129.132.0.0/16'),
+);
+
+$IDProviders['https://aai-idp.uzh.ch/idp/shibboleth'] = array(
+        'SSO' => 'https://aai-idp.uzh.ch/idp/profile/Shibboleth/SSO',
+        'Name' => 'Universität Zürich',
+        'Type' => 'university',
+	'Realm' => 'uzh.ch',
+        'en' => array ('Keywords' => 'Zurich Irchel+Park'),
 );
 
 
@@ -45,7 +50,7 @@ $IDProviders['vho'] = array (
 );
 
 // An example of a configuration with multiple network blocks and multiple languages 
-$IDProviders['urn:mace:switch.ch:SWITCHaai:vho-switchaai.ch'] = array (
+$IDProviders['https://aai-logon.vho-switchaai.ch/idp/shibboleth'] = array (
 		'Type' => 'vho',
 		'Name' => 'Virtual Home Organisation',
 		'en' => array (
@@ -59,24 +64,7 @@ $IDProviders['urn:mace:switch.ch:SWITCHaai:vho-switchaai.ch'] = array (
 		'fr' => array ('Name' => 'Home Organisation Virtuelle'),
 		'it' => array ('Name' => 'Virtuale Home Organisation'),
 		'IP' => array ('130.59.6.0/16','127.0.0.0/24'),
-		'SSO' => 'https://aai.vho-switchaai.ch/shibboleth-idp/SSO',
-);
-
-
-// Example of a WAYF entry that would redirect the user to this cascaded WAYF
-// For SAML2 authentication requests, you must set the type to 'wayf' so that
-// The user is not returned back to the Service Provider but forwarded to this
-// additional Discovery Service
-$IDProviders['urn:mace:switch.ch:SWITCHaai:edugain.net'] = array (
-		'SSO' => 'https://maclh.switch.ch/ShiBE-R/ShiBEWebSSORequester',
-		'Name' => 'Login via eduGAIN (testing)',
-		'Type' => 'wayf',
-);
-
-$IDProviders['urn:geant:edugain:component:be:switch:development.switch.ch'] = array (
-		'Type' => 'other',
-		'Name' => 'Login via eduGAIN (development)',
-		'SSO' => 'https://maclh.switch.ch/ShiBE-H/WebSSORequestListener',
+		'SSO' => 'https://aai-logon.vho-switchaai.ch/idp/profile/Shibboleth/SSO',
 );
 
 // Example of an IDP you want not to be displayed when IDPs are parsed from
@@ -85,7 +73,7 @@ $IDProviders['urn:geant:edugain:component:be:switch:development.switch.ch'] = ar
 
 
 // Category
-$IDProviders['other'] = array (
+$IDProviders['unknown'] = array (
 		'Type' => 'category',
 		'Name' => 'Others',
 		'de' => array ('Name' => 'Andere'),
@@ -93,13 +81,4 @@ $IDProviders['other'] = array (
 		'it' => array ('Name' => 'Altri'),
 );
 
-
-// Standard example with a Type that could be used to hide certain
-// Identity Providers in the list of an embedded WAYF according to their type
-$IDProviders['https://aai-logon.switch.ch/idp/shibboleth'] = array(
-		'Type' => 'other',
-		'Name' => 'SWITCH - Serving Swiss Universities',
-		'SSO' => 'https://aai-logon.switch.ch/idp/profile/Shibboleth/SSO',
-);
-
 ?>

config.dist.php

@@ -57,7 +57,7 @@ $userImprovedDropDownList = true;
 
 // Set to true in order to enable reading the Identity Provider from a SAML2 
 // metadata file defined below in $metadataFile
-$useSAML2Metadata = true; 
+$useSAML2Metadata = false; 
 
   // If true parsed metadata shall have precedence if there are entries defined 
   // in metadata as well as the local IDProviders configuration file.