summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorMorten Tokle <mortent@oath.com>2018-09-07 11:20:11 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2018-09-12 10:49:39 +0200
commit74a2ba02e99956a9f033beaed7fb3365eb67a4ad (patch)
tree0046c45a59c3f2dca833ccaacecec5fab039013a /jdisc_http_service
parent22c089f4d9ca621ea1c93dfc63c3995f4200224a (diff)
Set up components and config for ssl/ssl-provider
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def21
1 files changed, 18 insertions, 3 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 9ae4713c633..157ffabdd63 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
@@ -44,6 +44,23 @@ tcpNoDelay bool default=true
# Whether to enable SSL for this connector.
ssl.enabled bool default=false
+# File with private key in PEM format
+ssl.privateKeyFile string default=""
+
+# File with certificate in PEM format
+ssl.certificateFile string default=""
+
+# with trusted CA certificates in PEM format. Used to verify clients
+ssl.caCertificateFile string default=""
+
+# Client authentication mode. See SSLEngine.getNeedClientAuth()/getWantClientAuth() for details.
+ssl.clientAuth enum { DISABLED, WANT_AUTH, NEED_AUTH } default=DISABLED
+
+
+#########################################################################################
+# Config below is deprecated. Do not use
+#########################################################################################
+
# The name of the key to the password to the key store if in the secret store, if JKS is used.
# Must be empty with PEM
# By default this is also used to look up the password to the trust store.
@@ -89,11 +106,9 @@ ssl.sslKeyManagerFactoryAlgorithm string default="SunX509"
# The SSL protocol passed to SSLContext.getInstance()
ssl.protocol string default="TLS"
-# Client authentication mode. See SSLEngine.getNeedClientAuth()/getWantClientAuth() for details.
-ssl.clientAuth enum { DISABLED, WANT_AUTH, NEED_AUTH } default=DISABLED
-
# The SecureRandom implementation passed to SSLEngine.init()
# Java have a default pseudo-random number generator (PRNG) for crypto operations. This default may have performance
# issues on some platform (e.g. NativePRNG in Linux utilizes a global lock). Changing the generator to SHA1PRNG may
# improve performance. Set value to empty string to use the default generator.
ssl.prng string default=""
+