adjust authn options and metadata for release config

docker · Jan 20, 2017 · be5ca7f · be5ca7f
1 parent 7f462f2
commit be5ca7f
Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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>