aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/main/resources
diff options
context:
space:
mode:
authorMorten Tokle <morten.tokle@gmail.com>2019-06-21 14:50:28 +0200
committerandreer <andreer@verizonmedia.com>2019-06-24 11:06:03 +0200
commit7809e2a0d4b68779c03ffd3ce7fd3dab7162d4a4 (patch)
tree81d58bfc5791db2a9f543834f0b35d76a7418570 /jdisc_http_service/src/main/resources
parent9e793e7bdca0862bca330cb21fa5ebb1a81c8f21 (diff)
tls config from deploy params
Diffstat (limited to 'jdisc_http_service/src/main/resources')
-rw-r--r--jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def10
1 files changed, 8 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
index 7735420d803..c6c6fad345b 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
+++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
@@ -56,12 +56,18 @@ throttling.idleTimeout double default=-1.0
# Whether to enable SSL for this connector.
ssl.enabled bool default=false
-# File with private key in PEM format
+# File with private key in PEM format. Specify either this or privateKey, but not both
ssl.privateKeyFile string default=""
-# File with certificate in PEM format
+# Private key in PEM format. Specify either this or privateKeyFile, but not both
+ssl.privateKey string default=""
+
+# File with certificate in PEM format. Specify either this or certificate, but not both
ssl.certificateFile string default=""
+# Certificate in PEM format. Specify either this or certificateFile, but not both
+ssl.certificate string default=""
+
# with trusted CA certificates in PEM format. Used to verify clients
ssl.caCertificateFile string default=""