[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/ldap.properties

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 17 11:37:02 2014
New Revision: 7151

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7151&view=rev
Log:
Comment defaulted properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/ldap.properties

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=7151&r1=7150&r2=7151&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Wed Dec 17 11:37:02 2014
@@ -1,13 +1,13 @@
 # LDAP authentication configuration, see authn/ldap-authn-config.xml
 
 ## Authenticator strategy, either anonSearchAuthenticator, bindSearchAuthenticator, directAuthenticator, adAuthenticator
-idp.authn.LDAP.authenticator					= anonSearchAuthenticator
+#idp.authn.LDAP.authenticator                   = anonSearchAuthenticator
 
 ## Connection properties ##
-idp.authn.LDAP.ldapURL							= ldap://localhost:10389
-idp.authn.LDAP.useStartTLS						= true
-idp.authn.LDAP.useSSL							= false
-idp.authn.LDAP.connectTimeout					= 3000
+idp.authn.LDAP.ldapURL                          = ldap://localhost:10389
+#idp.authn.LDAP.useStartTLS                     = true
+#idp.authn.LDAP.useSSL                          = false
+#idp.authn.LDAP.connectTimeout                  = 3000
 
 ## SSL configuration, either defaultTrust, certificateTrust, or keyStoreTrust ##
 idp.authn.LDAP.sslConfig                        = certificateTrust
@@ -15,39 +15,39 @@
 idp.authn.LDAP.trustStore                       = file:%{idp.home}/credentials/ldap-server.truststore
 
 ## Return attributes ##
-idp.authn.LDAP.returnAttributes					= cn,businessCategory,mail
+idp.authn.LDAP.returnAttributes                 = cn,businessCategory,mail
 
 ## DN resolution properties ##
 
 # Search DN resolution, used by anonSearchAuthenticator, bindSearchAuthenticator
 # for AD: CN=Users,DC=example,DC=org
-idp.authn.LDAP.baseDN              				= ou=people,dc=example,dc=org
-idp.authn.LDAP.subtreeSearch					= false
-idp.authn.LDAP.userFilter						= (uid={user})
+idp.authn.LDAP.baseDN                           = ou=people,dc=example,dc=org
+#idp.authn.LDAP.subtreeSearch                   = false
+idp.authn.LDAP.userFilter                       = (uid={user})
 # bind search configuration
 # for AD: idp.authn.LDAP.bindDN=adminuser at domain.com
-idp.authn.LDAP.bindDN           				= uid=myservice,ou=system
-idp.authn.LDAP.bindDNCredential 				= myServicePassword
+idp.authn.LDAP.bindDN                           = uid=myservice,ou=system
+idp.authn.LDAP.bindDNCredential                 = myServicePassword
 
 # Format DN resolution, used by directAuthenticator, adAuthenticator
 # for AD use idp.authn.LDAP.dnFormat=%s at domain.com
-idp.authn.LDAP.dnFormat							= uid=%s,ou=people,dc=example,dc=org
+idp.authn.LDAP.dnFormat                         = uid=%s,ou=people,dc=example,dc=org
 
 # LDAP attribute configuration, see attribute-resolver.xml
-idp.attribute.resolver.LDAP.ldapURL				= %{idp.authn.LDAP.ldapURL}
-idp.attribute.resolver.LDAP.baseDN				= %{idp.authn.LDAP.baseDN}
-idp.attribute.resolver.LDAP.bindDN				= %{idp.authn.LDAP.bindDN}
-idp.attribute.resolver.LDAP.bindDNCredential	= %{idp.authn.LDAP.bindDNCredential}
-idp.attribute.resolver.LDAP.useStartTLS         = %{idp.authn.LDAP.useStartTLS}
+idp.attribute.resolver.LDAP.ldapURL             = %{idp.authn.LDAP.ldapURL}
+idp.attribute.resolver.LDAP.baseDN              = %{idp.authn.LDAP.baseDN}
+idp.attribute.resolver.LDAP.bindDN              = %{idp.authn.LDAP.bindDN}
+idp.attribute.resolver.LDAP.bindDNCredential    = %{idp.authn.LDAP.bindDNCredential}
+idp.attribute.resolver.LDAP.useStartTLS         = %{idp.authn.LDAP.useStartTLS:true}
 idp.attribute.resolver.LDAP.trustCertificates   = %{idp.authn.LDAP.trustCertificates}
 
 # LDAP pool configuration, used for both authn and DN resolution
-idp.pool.LDAP.minSize							= 3
-idp.pool.LDAP.maxSize							= 10
-idp.pool.LDAP.validateOnCheckout				= false
-idp.pool.LDAP.validatePeriodically				= true
-idp.pool.LDAP.validatePeriod					= 300
-idp.pool.LDAP.prunePeriod						= 300
-idp.pool.LDAP.idleTime							= 600
-idp.pool.LDAP.blockWaitTime						= 3000
-idp.pool.LDAP.failFastInitialize                = false
+#idp.pool.LDAP.minSize                          = 3
+#idp.pool.LDAP.maxSize                          = 10
+#idp.pool.LDAP.validateOnCheckout               = false
+#idp.pool.LDAP.validatePeriodically             = true
+#idp.pool.LDAP.validatePeriod                   = 300
+#idp.pool.LDAP.prunePeriod                      = 300
+#idp.pool.LDAP.idleTime                         = 600
+#idp.pool.LDAP.blockWaitTime                    = 3000
+#idp.pool.LDAP.failFastInitialize               = false