This is an automated email from the ASF dual-hosted git repository.
zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new bbcf1d8 Fix typo: TSL should be TLS in server_conf
bbcf1d8 is described below
commit bbcf1d8aec197074f707bf3d16684705396322f3
Author: zhaijack <zhaiji...@gmail.com>
AuthorDate: Wed Aug 9 11:42:09 2017 +0800
Fix typo: TSL should be TLS in server_conf
TSL should be TLS in server_conf
Author: zhaijack <zhaiji...@gmail.com>
Reviewers: Sijie Guo <None>
This closes #421 from zhaijack/fix_conf_typo
---
bookkeeper-server/conf/bk_server.conf | 22 +++++++++++-----------
site/_data/config/bk_server.yaml | 22 +++++++++++-----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/bookkeeper-server/conf/bk_server.conf
b/bookkeeper-server/conf/bk_server.conf
index e2fbce1..d3667b2 100755
--- a/bookkeeper-server/conf/bk_server.conf
+++ b/bookkeeper-server/conf/bk_server.conf
@@ -154,35 +154,35 @@ journalDirectory=/tmp/bk-txn
# isForceGCAllowWhenNoSpace=false
#############################################################################
-## TSL settings
+## TLS settings
#############################################################################
-# TSL Provider (JDK or OpenSSL).
-# tslProvider=OpenSSL
+# TLS Provider (JDK or OpenSSL).
+# tlsProvider=OpenSSL
# The path to the class that provides security.
-# tslProviderFactoryClass=org.apache.bookkeeper.security.SSLContextFactory
+# tlsProviderFactoryClass=org.apache.bookkeeper.security.SSLContextFactory
# Type of security used by server.
-# tslClientAuthentication=true
+# tlsClientAuthentication=true
# Bookie Keystore type.
-# tslKeyStoreType=JKS
+# tlsKeyStoreType=JKS
# Bookie Keystore location (path).
-# tslKeyStore=null
+# tlsKeyStore=null
# Bookie Keystore password path, if the keystore is protected by a password.
-# tslKeyStorePasswordPath=null
+# tlsKeyStorePasswordPath=null
# Bookie Truststore type.
-# tslTrustStoreType=null
+# tlsTrustStoreType=null
# Bookie Truststore location (path).
-# tslTrustStore=null
+# tlsTrustStore=null
# Bookie Truststore password path, if the trust store is protected by a
password.
-# tslTrustStorePasswordPath=null
+# tlsTrustStorePasswordPath=null
#############################################################################
## Long poll request parameter settings
diff --git a/site/_data/config/bk_server.yaml b/site/_data/config/bk_server.yaml
index 9de5bac..af74b5a 100644
--- a/site/_data/config/bk_server.yaml
+++ b/site/_data/config/bk_server.yaml
@@ -88,36 +88,36 @@ groups:
description: Whether force compaction is allowed when the disk is full or
almost full. Forcing GC may get some space back, but may also fill up disk
space more quickly. This is because new log files are created before GC, while
old garbage log files are deleted after GC.
default: 'false'
-- name: TSL settings
+- name: TLS settings
params:
- param: tslProvider
- description: TSL Provider (JDK or OpenSSL)
+ description: TLS Provider (JDK or OpenSSL)
default: OpenSSL
- - param: tslProviderFactoryClass
+ - param: tlsProviderFactoryClass
description: The path to the class that provides security.
default: org.apache.bookkeeper.security.SSLContextFactory
- - param: tslClientAuthentication
+ - param: tlsClientAuthentication
description: Type of security used by server.
default: 'true'
- - param: tslKeyStoreType
+ - param: tlsKeyStoreType
description: Bookie Keystore type.
default: JKS
- - param: tslKeyStore
+ - param: tlsKeyStore
description: Bookie Keystore location (path).
default: null
- - param: tslKeyStore
+ - param: tlsKeyStore
description: Bookie Keystore location (path).
default: null
- - param: tslKeyStorePasswordPath
+ - param: tlsKeyStorePasswordPath
description: Bookie Keystore password path, if the keystore is protected
by a password.
default: null
- - param: tslTrustStoreType
+ - param: tlsTrustStoreType
description: Bookie Truststore type.
default: null
- - param: tslTrustStore
+ - param: tlsTrustStore
description: Bookie Truststore location (path).
default: null
- - param: tslTrustStorePasswordPath
+ - param: tlsTrustStorePasswordPath
description: Bookie Truststore password path, if the truststore is
protected by a password.
default: null
--
To stop receiving notification emails like this one, please contact
['"commits@bookkeeper.apache.org" <commits@bookkeeper.apache.org>'].
