You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/06/04 14:37:08 UTC
[3/6] incubator-tinkerpop git commit: Update docs for SSL config in
Gremlin Server.
Update docs for SSL config in Gremlin Server.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c96c08d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c96c08d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c96c08d8
Branch: refs/heads/master
Commit: c96c08d85195014f38ed16b602f408a8a9471779
Parents: 2103337
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 4 08:02:04 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 4 08:02:04 2015 -0400
----------------------------------------------------------------------
docs/src/gremlin-applications.asciidoc | 4 ++++
.../main/java/org/apache/tinkerpop/gremlin/server/Settings.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c96c08d8/docs/src/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/gremlin-applications.asciidoc b/docs/src/gremlin-applications.asciidoc
index ea3742a..d0e88f1 100644
--- a/docs/src/gremlin-applications.asciidoc
+++ b/docs/src/gremlin-applications.asciidoc
@@ -512,6 +512,10 @@ The following table describes the various configuration options that Gremlin Ser
|serializers[X].config |A `Map` containing `MessageSerializer` specific configurations. |_none_
|serializedResponseTimeout |The amount of time in milliseconds before a response serialization times out. The notion of "response serialization" refers to the time it takes for Gremlin Server to iterate an entire result after the script is evaluated in the `ScriptEngine`. |30000
|ssl.enabled |Determines if SSL is turned on or not. |false
+|ssl.keyCertChainFile |The X.509 certificate chain file in PEM format. If this value is not present and `ssl.enabled` is `true` a self-signed certificate will be used (not suitable for production). |_none_
+|ssl.keyFile |The `PKCS#8` private key file in PEM format. If this value is not present and `ssl.enabled` is `true` a self-signed certificate will be used (not suitable for production). |_none_
+|ssl.keyPassword |The password of the `keyFile` if it's not password-protected |_none_
+|ssl.trustCertChainFile |Trusted certificates for verifying the remote endpoint's certificate. The file should contain an X.509 certificate chain in PEM format. A system default will be used if this setting is not present. |_none_
|threadPoolBoss |The number of threads available to Gremlin Server for accepting connections. Should always be set to `1`. |1
|threadPoolWorker |The number of threads available to Gremlin Server for processing non-blocking reads and writes. |1
|=========================================================
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c96c08d8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 4f3cb2c..a32ec30 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -295,7 +295,7 @@ public class Settings {
public String keyFile = null;
/**
- * The password of the {@link #keyFile}, or {@code null} if it's not password-protected
+ * The password of the {@link #keyFile}, or {@code null} if it's not password-protected.
*/
public String keyPassword = null;