From b3dff2789104e11f0b7ba9e47385ead9a6166d53 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 21 Nov 2014 12:21:25 +0100
Subject: Add TLS support for thrift connection to master, switch to TLSv1.2
 everywhere

---
 config/global.properties.example | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3-55-g7522