Add connecting to LDAP with cert (JKS in globals.config)

Connecting to BW LDAP works now (finally!!)

1 files changed, 24 insertions, 11 deletions

diff --git a/config/global.properties.example b/config/global.properties.example
index 0b26f75..668bfdb 100644
--- a/config/global.properties.example
+++ b/config/global.properties.example
@@ -7,31 +7,31 @@
 # the dir where the images are stored
 image_dir=/tmp
 
-# keystore (.jks format)
-keystore=./config/keystore.jks
-
 #####################
-#	LDAP data		#
+#	LDAP			#
 #####################
 
 # the port of the LDAP server
 ldap_port=636
 
 # the host address of the LDAP server
-ldap_host=bv1.ruf.uni-freiburg.de
+ldap_host=bwservices-test.vm.uni-freiburg.de
 
 # SSL usage
 ldap_ssl=true
 
 # bind query (don't forget to escape \= and use a % for the username replacement
-ldap_bind_query=uid\=%,ou\=people,dc\=uni-freiburg,dc\=de
+ldap_bind_query=uid\=%,ou\=users,dc\=bwlehrpool,dc\=uni-freiburg,dc\=de
 
 # search baseDn
-ldap_search_base_dn=ou\=people,dc\=uni-freiburg,dc\=de
-
+ldap_search_base_dn=ou\=users,dc\=bwlehrpool,dc\=uni-freiburg,dc\=de
 
 # search filter (use a % for the username replacement
-ldap_search_filter=(&(objectclass\=person)(uid\=%))
+ldap_search_filter=(&(objectclass\=person)(|(uid=%)(cn=%)))
+
+# ldap keystore with public key
+ldap_keystore_path=./config/ldap.jks
+ldap_keystore_password=changeit
 
 #####################
 #	Session 		#
@@ -53,5 +53,18 @@ ftp_base_dir=/tmp
 # the port of the ftp server
 ftp_port=2221
 
-# timeout for kicking ftp users (in minutes)
-ftp_timeout=60
\ No newline at end of file
+# timeout for kicking idling ftp users (in minutes)
+ftp_timeout=30
+
+#####################
+#	Keystore		#
+#####################
+
+# keystore (.jks format)
+keystore_file=./config/keystore.jks
+
+# keystore alias
+keystore_alias=ftp
+
+#keystore password
+keystore_password=password
\ No newline at end of file