summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSimon Rettberg2014-11-21 12:21:25 +0100
committerSimon Rettberg2014-11-21 12:21:25 +0100
commitb3dff2789104e11f0b7ba9e47385ead9a6166d53 (patch)
tree17220e07a648e2986cb327029224e9bf08b2b425 /config
parentAdd 8 seconds timeout to thrift connection (diff)
downloadsatellite-daemon-b3dff2789104e11f0b7ba9e47385ead9a6166d53.tar.gz
satellite-daemon-b3dff2789104e11f0b7ba9e47385ead9a6166d53.tar.xz
satellite-daemon-b3dff2789104e11f0b7ba9e47385ead9a6166d53.zip
Add TLS support for thrift connection to master, switch to TLSv1.2 everywhere
Diffstat (limited to 'config')
-rw-r--r--config/global.properties.example7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/global.properties.example b/config/global.properties.example
index 4c009a6..192a76b 100644
--- a/config/global.properties.example
+++ b/config/global.properties.example
@@ -23,8 +23,11 @@ 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
+# use TLS? defaults to yes if missing
+THRIFT_TLS=yes
+
+# port where the thrift connection is opened (usually this is 9090/plain 9091/tls)
+THRIFT_PORT=9091
# proxy configuration:
# 3 options for proxy configuration: AUTO = autmatically, YES, NO. If nothing is