From be5ca7f6d3c58e5b66655caaa983ecb768d90307 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 20 Jan 2017 16:47:56 -0600
Subject: [PATCH] adjust authn options and metadata for release config

---
 conf/authn/krb5-authn-config.xml     | 4 ++--
 conf/authn/password-authn-config.xml | 4 ++--
 conf/metadata-providers.xml          | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/authn/krb5-authn-config.xml b/conf/authn/krb5-authn-config.xml
index 3230134..7dc59ba 100644
--- a/conf/authn/krb5-authn-config.xml
+++ b/conf/authn/krb5-authn-config.xml
@@ -21,10 +21,10 @@
     The keytab bean must be an absolute file pathname and not a reference to a classpath resource,
     so if idp.home is not a path, don't use it in the value.
     -->
-    
+    <!--
     <bean id="shibboleth.authn.Krb5.ServicePrincipal" class="java.lang.String" c:_0="HTTP/idp.testbed.tier.internet2.edu@TESTBED.TIER.INTERNET2.EDU" />
     <bean id="shibboleth.authn.Krb5.Keytab" class="java.lang.String" c:_0="%{idp.home}/credentials/http.keytab" />
-    
+    -->
     
     <alias name="ValidateUsernamePasswordAgainstKerberos" alias="ValidateUsernamePassword"/>
 
diff --git a/conf/authn/password-authn-config.xml b/conf/authn/password-authn-config.xml
index 48b2c3d..08886b2 100644
--- a/conf/authn/password-authn-config.xml
+++ b/conf/authn/password-authn-config.xml
@@ -14,8 +14,8 @@
     
     <!-- Choose an import based on the back-end you want to use. -->
     <!-- <import resource="jaas-authn-config.xml" /> -->
-    <import resource="krb5-authn-config.xml" />
-    <!--<import resource="ldap-authn-config.xml" />-->
+    <!--<import resource="krb5-authn-config.xml" />-->
+    <import resource="ldap-authn-config.xml" />
     
     
     <!-- Names of form fields to pull username and password from. -->
diff --git a/conf/metadata-providers.xml b/conf/metadata-providers.xml
index 778989c..fc547b6 100644
--- a/conf/metadata-providers.xml
+++ b/conf/metadata-providers.xml
@@ -80,8 +80,6 @@
 			
     </MetadataProvider>
 
-    <MetadataProvider id="testbed.tier" xsi:type="FilesystemMetadataProvider" metadataFile="/opt/shibboleth-idp/metadata/testbed-tier-metadata.xml"/>
-	<MetadataProvider id="sp.testbed.tier" xsi:type="FilesystemMetadataProvider" metadataFile="/opt/shibboleth-idp/metadata/sp-testbed-tier-metadata.xml"/>
 	
 </MetadataProvider>