Update sample config

1 files changed, 22 insertions, 54 deletions

diff --git a/config/global.properties.example b/config/global.properties.example
index b8e79d5..1c0c8eb 100644
--- a/config/global.properties.example
+++ b/config/global.properties.example
@@ -1,78 +1,46 @@
 #fill in properties and rename to global.properties
-
 #####################
-# Main #
+#       Main        #
 #####################
 
 # the dir where the images are stored
-image_dir=/tmp
-
-#####################
-# LDAP #
-#####################
-
-# the port of the LDAP server
-ldap_port=636
-
-# the host address of the LDAP server
-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
-eplacement
-ldap_bind_query=uid\=%,ou\=users,dc\=bwlehrpool,dc\=uni-freiburg,dc\=de
-
-# search baseDn
-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=%)(cn=%)))
-
-# ldap keystore with public key
-ldap_keystore_path=./config/ldap.jks
-ldap_keystore_password=changeit
+storage.dir=/mnt/store/images
 
 #####################
-# Session #
+#       Session     #
 #####################
 
 # session timeout for users (in seconds)
-session_timeout_user=600
+session.user.timeout=7200
 
 # session timeout for servers (in seconds)
-session_timeout_server=600
+session.server.timeout=86400
 
 #####################
-# Ssl Socket #
+#        SSL        #
 #####################
 
-# port that is used for data connection between satellite and master
-ssl_socket_port=56456
-
-# timeout for kicking idling clients (in minutes)
-ssl_socket_timeout=1
-
 # keystore (.jks format)
-ssl_keystore_file=./config/sslsocket.jks
+ssl.keystore.file=./config/masterserver.jks
 
 # keystore alias
-ssl_keystore_alias=alias
+ssl.keystore.alias=alias_in_keystore
 
 # keystore password
-ssl_keystore_password=password
+ssl.keystore.password=password_for_keystore
 
-# how often should the masterserver request a block
-# from the satellite if the check sum fails
-# until an error is sent
-ssl_socket_transmit_times=20
+############ File transfer
 
-#####################
-# CRC Scheduling #
-#####################
+# port that is used for data connection between satellite and master
+filetransfer.port.ssl=9051
+filetransfer.port.plain=9050
+
+# timeout for kicking idling clients (in seconds)
+filetransfer.timeout=60
+filetransfer.retries=4
+
+################## Thrift (RPC)
+
+thrift.port.plain = 9090
+thrift.port.ssl = 9091
 
-# how often will the crc scheduler check the crc sums of uploading images in
-econds
-# minimum of 60 s recommended
-crc_scheduling_interval=60