diff options
author | Nils Schwabe | 2014-04-22 16:56:07 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-22 16:56:07 +0200 |
commit | 01e662bdfff823c4f5f0b6a270807fd0a3d2825f (patch) | |
tree | daf063bc84c06781768794c17cc76f08decaa9c3 /config | |
parent | Added test case for sha512crypt, removed try/catch blocks from other tests, s... (diff) | |
download | masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.tar.gz masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.tar.xz masterserver-01e662bdfff823c4f5f0b6a270807fd0a3d2825f.zip |
added a method to imageserver so that finshed uploads can be signaled
did some todos from simon
moved FtpCredentials creation to MasterFtpServer.java
moved some options to to config file
Diffstat (limited to 'config')
-rw-r--r-- | config/global.properties.example | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/config/global.properties.example b/config/global.properties.example index c628288..e2e1a3b 100644 --- a/config/global.properties.example +++ b/config/global.properties.example @@ -1,2 +1,34 @@ # fill in properties and rename to global.properties + +##################### +# Directories # +##################### + +# the base dir of the ftp server (should exists) ftp_base_dir=/tmp + +# the dir where the images are stored +image_dir=/tmp + +##################### +# LDAP data # +##################### + +# the port of the LDAP server +ldap_port=636 + +# the host address of the LDAP server +ldap_host=bv1.ruf.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 + +# search baseDn +ldap_search_base_dn=ou\=people,dc\=uni-freiburg,dc\=de + + +# search filter (use a % for the username replacement +ldap_search_filter=(&(objectclass\=person)(uid\=%))
\ No newline at end of file |