summaryrefslogtreecommitdiffstats
path: root/config/global.properties.example
diff options
context:
space:
mode:
authorNils Schwabe2014-07-25 11:37:42 +0200
committerNils Schwabe2014-07-25 11:37:42 +0200
commita345d4a7af3a9017506e714fd7d548f42cc4492a (patch)
treea55973bd67861d4c47237ea12bf8c287d5e39f80 /config/global.properties.example
parentAdd "synchronized" to UploadingImage (diff)
downloadmasterserver-a345d4a7af3a9017506e714fd7d548f42cc4492a.tar.gz
masterserver-a345d4a7af3a9017506e714fd7d548f42cc4492a.tar.xz
masterserver-a345d4a7af3a9017506e714fd7d548f42cc4492a.zip
Make trasmit times configurabl
Make new globals.properties.example
Diffstat (limited to 'config/global.properties.example')
-rw-r--r--config/global.properties.example30
1 files changed, 14 insertions, 16 deletions
diff --git a/config/global.properties.example b/config/global.properties.example
index 668bfdb..d4f46a2 100644
--- a/config/global.properties.example
+++ b/config/global.properties.example
@@ -44,27 +44,25 @@ session_timeout_user=600
session_timeout_server=600
#####################
-# FTP Server #
+# Ssl Socket #
#####################
-# the base dir of the ftp server (should exists)
-ftp_base_dir=/tmp
+# port that is used for data connection between satellite and master
+ssl_socket_port=56456
-# the port of the ftp server
-ftp_port=2221
-
-# timeout for kicking idling ftp users (in minutes)
-ftp_timeout=30
-
-#####################
-# Keystore #
-#####################
+# timeout for kicking idling clients (in minutes)
+ssl_socket_timeout=1
# keystore (.jks format)
-keystore_file=./config/keystore.jks
+ssl_keystore_file=./config/sslsocket.jks
# keystore alias
-keystore_alias=ftp
+ssl_keystore_alias=alias
+
+# keystore password
+ssl_keystore_password=password
-#keystore password
-keystore_password=password \ No newline at end of file
+# 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 \ No newline at end of file