From 91d32290d336e615e2d8ef7f009e753e146136bb Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Tue, 11 Nov 2014 14:11:52 +0100
Subject: Implemented possible connection to master server via proxy server.
 Currently proxy server is found by DNS searching.

---
 config/global.properties.example | 43 ++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

(limited to 'config')

diff --git a/config/global.properties.example b/config/global.properties.example
index 2275e2b..4c009a6 100644
--- a/config/global.properties.example
+++ b/config/global.properties.example
@@ -1,15 +1,42 @@
 # Example configuration file for the satellite-daemon
-
 # hostname of the masterserver
-MASTERSERVER_HOST=132.230.4.17
+MASTERSERVER_HOST=111.111.4.12
+
+# the image folder where all up- and downloads are saved
+IMAGE_FOLDER=./images
+
+# the keystore that is used for the filetransfer
+TRUSTSTORE_PATH=./config/trust.jks
+
+# type of the keystore???
+KEYSTORE_TYPE=jks
 
-# the truststore that is used to validate the certificate of the server
-# leave blank to use system's cacert store
-TRUSTSTORE_PATH=/path/to/truststore.jks
+# the password of the keystore above
+FILETRANSFER_KEYSTORE_PASSWORD=password
 
-# port to which the thrift connection is opened (usually this is 9090)
+# the alias of the keystore for the secure thrift connection
+THRIFT_KEYSTORE_ALIAS=alias
+
+# it's password
+THRIFT_KEYSTORE_PASSWORD=password
+
+# and it's path
+THRIFT_KEYSTORE_PATH=./config/satellite.jks
+
+# port where the thrift connection is opened (usually this is 9191)
 THRIFT_PORT=9090
 
-# the image folder where all up- and downloads are saved
-IMAGE_FOLDER=/path/to/images
+# proxy configuration:
+# 3 options for proxy configuration: AUTO = autmatically, YES, NO. If nothing is
+# set, the default automatically will be choosen.
+PROXY_CONF=AUTO
+# If PROXY_CONF = YES some more information for connection are necessary:
+# PROXY_ADDR = destination addres
+PROXY_ADDR=1.2.3.4
+
+# PROXY_PORT = port for proxy connection
+PROXY_PORT=1080
 
+# Username and password are optional, if empty, it is assumed that not necessary:
+PROXY_USERNAME=test
+PROXY_PASSWORD=password
-- 
cgit v1.2.3-55-g7522