Author: scantor
Date: Wed Dec 17 14:15:47 2014
New Revision: 7155
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7155&view=rev
Log:
IDP-522 - propose some defaults
Modified:
trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
trunk/idp-conf/src/main/resources/conf/ldap.properties
Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=7155&r1=7154&r2=7155&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Wed Dec 17 14:15:47 2014
@@ -27,12 +27,12 @@
<alias name="%{idp.authn.LDAP.sslConfig:defaultTrust}" alias="sslConfig" />
<bean id="defaultTrust" class="org.ldaptive.ssl.SslConfig" />
- <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig">
+ <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig" lazy-init="true">
<property name="credentialConfig">
<bean class="org.ldaptive.ssl.X509CredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates}" />
</property>
</bean>
- <bean id="keyStoreTrust" class="org.ldaptive.ssl.SslConfig">
+ <bean id="keyStoreTrust" class="org.ldaptive.ssl.SslConfig" lazy-init="true">
<property name="credentialConfig">
<bean class="org.ldaptive.ssl.KeyStoreCredentialConfig" p:trustStore="%{idp.authn.LDAP.trustStore}" />
</property>
Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7155&r1=7154&r2=7155&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Wed Dec 17 14:15:47 2014
@@ -10,9 +10,11 @@
#idp.authn.LDAP.connectTimeout = 3000
## SSL configuration, either defaultTrust, certificateTrust, or keyStoreTrust ##
-idp.authn.LDAP.sslConfig = certificateTrust
-idp.authn.LDAP.trustCertificates = file:%{idp.home}/credentials/ldap-server.crt
-idp.authn.LDAP.trustStore = file:%{idp.home}/credentials/ldap-server.truststore
+#idp.authn.LDAP.sslConfig = defaultTrust
+## If using certificateTrust above, set to the trusted certificate's path
+idp.authn.LDAP.trustCertificates = file:///opt/shibboleth-idp/credentials/ldap-server.crt
+## If using keyStoreTrust above, set to the truststore path
+idp.authn.LDAP.trustStore = file:///opt/shibboleth-idp/credentials/ldap-server.truststore
## Return attributes ##
idp.authn.LDAP.returnAttributes = cn,businessCategory,mail