You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2017/03/03 17:02:47 UTC
accumulo git commit: ACCUMULO-4596 Removed defaults for ssl properties
Repository: accumulo
Updated Branches:
refs/heads/master a60f55024 -> 1072d20bb
ACCUMULO-4596 Removed defaults for ssl properties
* Defaults contained ACCUMULO_CONF_DIR variable which might
not be set in future.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1072d20b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1072d20b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1072d20b
Branch: refs/heads/master
Commit: 1072d20bba419d3308b249cbf8619b3386cd99d5
Parents: a60f550
Author: Mike Walch <mw...@apache.org>
Authored: Fri Mar 3 11:59:01 2017 -0500
Committer: Mike Walch <mw...@apache.org>
Committed: Fri Mar 3 11:59:04 2017 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/conf/Property.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1072d20b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index faa67f9..6ff2bed 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -86,14 +86,12 @@ public enum Property {
+ "the configuration file, set this property to true."),
// SSL properties local to each node (see also instance.ssl.enabled which must be consistent across all nodes in an instance)
RPC_PREFIX("rpc.", null, PropertyType.PREFIX, "Properties in this category related to the configuration of SSL keys for RPC. See also instance.ssl.enabled"),
- RPC_SSL_KEYSTORE_PATH("rpc.javax.net.ssl.keyStore", "$ACCUMULO_CONF_DIR/ssl/keystore.jks", PropertyType.PATH,
- "Path of the keystore file for the servers' private SSL key"),
+ RPC_SSL_KEYSTORE_PATH("rpc.javax.net.ssl.keyStore", "", PropertyType.PATH, "Path of the keystore file for the servers' priva:q" + "te SSL key"),
@Sensitive
RPC_SSL_KEYSTORE_PASSWORD("rpc.javax.net.ssl.keyStorePassword", "", PropertyType.STRING,
"Password used to encrypt the SSL private keystore. Leave blank to use the Accumulo instance secret"),
RPC_SSL_KEYSTORE_TYPE("rpc.javax.net.ssl.keyStoreType", "jks", PropertyType.STRING, "Type of SSL keystore"),
- RPC_SSL_TRUSTSTORE_PATH("rpc.javax.net.ssl.trustStore", "$ACCUMULO_CONF_DIR/ssl/truststore.jks", PropertyType.PATH,
- "Path of the truststore file for the root cert"),
+ RPC_SSL_TRUSTSTORE_PATH("rpc.javax.net.ssl.trustStore", "", PropertyType.PATH, "Path of the truststore file for the root cert"),
@Sensitive
RPC_SSL_TRUSTSTORE_PASSWORD("rpc.javax.net.ssl.trustStorePassword", "", PropertyType.STRING,
"Password used to encrypt the SSL truststore. Leave blank to use no password"),