From cf39a41ce38e4fa5b80652a19155d99deed0db55 Mon Sep 17 00:00:00 2001 From: Olav Morken <olav.morken@uninett.no> Date: Tue, 6 Oct 2009 09:53:20 +0000 Subject: [PATCH] Remove references to openid-provider metadata Since the openid-provider seems to have gone, remove the metadata until it reappears. Update issue 215 Status: Started This change removes metadata-templates/openid-provider.php git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1824 44740490-163a-0410-bde0-09ae8108e29a --- .../Metadata/MetaDataStorageHandler.php | 5 ----- .../MetaDataStorageHandlerFlatFile.php | 1 - metadata-templates/openid-provider.php | 22 ------------------- 3 files changed, 28 deletions(-) delete mode 100644 metadata-templates/openid-provider.php diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php index 7d39cc810..86ea16706 100644 --- a/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php +++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandler.php @@ -145,11 +145,6 @@ class SimpleSAML_Metadata_MetaDataStorageHandler { case 'SingleSignOnService' : return $baseurl . 'shib13/idp/SSOService.php'; } - } elseif($set == 'openid-provider') { - switch ($property) { - case 'server' : - return $baseurl . 'openid/provider/server.php'; - } } throw new Exception('Could not generate metadata property ' . $property . ' for set ' . $set . '.'); diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php index 6c33ec42f..052dc771f 100644 --- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php +++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php @@ -18,7 +18,6 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta 'saml20-sp-hosted', 'saml20-sp-remote','saml20-idp-hosted', 'saml20-idp-remote', 'shib13-sp-hosted', 'shib13-sp-remote', 'shib13-idp-hosted', 'shib13-idp-remote', 'wsfed-sp-hosted', 'wsfed-idp-remote', - 'openid-provider' ); diff --git a/metadata-templates/openid-provider.php b/metadata-templates/openid-provider.php deleted file mode 100644 index d910701f2..000000000 --- a/metadata-templates/openid-provider.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/* - * OpenID Provider configuration - * - */ - - -$metadata = array( - - // Use the hostname as the array key - 'openidserver.example.org' => array( - - // The hostname of the server (VHOST) that this SAML entity will use. - 'host' => 'openidserver.example.org', - - // Authentication plugin to use. auth/login.php is the default one that uses LDAP. - 'auth' => 'saml2/sp/initSSO.php' - ) - -); - -?> -- GitLab