Repository: geode
Updated Branches:
  refs/heads/develop 08154dd77 -> 8a6e309fc


GEODE-3328 Properties to set Key/Trust Store Type for SSL configuration - add 
to docs
This closes #703


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/8a6e309f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/8a6e309f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/8a6e309f

Branch: refs/heads/develop
Commit: 8a6e309fcf083ee0420c2cbd0d080754ab3a0070
Parents: 08154dd
Author: Dave Barnes <dbar...@pivotal.io>
Authored: Wed Aug 9 15:22:22 2017 -0700
Committer: Dave Barnes <dbar...@pivotal.io>
Committed: Thu Aug 10 12:07:48 2017 -0700

----------------------------------------------------------------------
 geode-docs/managing/security/implementing_ssl.html.md.erb  | 3 +++
 geode-docs/reference/topics/gemfire_properties.html.md.erb | 7 +++++++
 2 files changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/8a6e309f/geode-docs/managing/security/implementing_ssl.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/managing/security/implementing_ssl.html.md.erb 
b/geode-docs/managing/security/implementing_ssl.html.md.erb
index 4894de7..5cf2517 100644
--- a/geode-docs/managing/security/implementing_ssl.html.md.erb
+++ b/geode-docs/managing/security/implementing_ssl.html.md.erb
@@ -101,6 +101,9 @@ any protocol that is enabled by default in the configured 
JSSE provider.</dd>
 <dt>**ssl-truststore, ssl-truststore-password**</dt>
 <dd>The path to the trust store and the trust store password, specified as 
strings</dd>
 
+<dt>**ssl-keystore-type, ssl-truststore-type**</dt>
+<dd>The types of the key store and trust store, specified as strings. The 
default for both is "JKS", indicating a Java key store or trust store.</dd>
+
 ### Example: secure communications throughout
 
 To implement secure SSL communications throughout an entire distributed 
system, each process should

http://git-wip-us.apache.org/repos/asf/geode/blob/8a6e309f/geode-docs/reference/topics/gemfire_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb 
b/geode-docs/reference/topics/gemfire_properties.html.md.erb
index c5030b9..238803e 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -653,6 +653,13 @@ Any security-related (properties that begin with <code 
class="ph codeph">securit
 <td></td>
 </tr>
 
+<tr>
+<td>ssl-keystore-type, ssl-truststore-type</td>
+<td>Strings. Type of key store or trust store. "JKS" indicates Java. One 
common alternative is "pkcs12".</td>
+<td>S, L</td>
+<td>JKS</td>
+</tr>
+
 <tr class="even">
 <td>start-dev-rest-api</td>
 <td>If set to true, then the developer REST API service will be started when 
cache is created. REST service can be configured using <code class="ph 
codeph">http-service-port</code> and <code class="ph 
codeph">http-service-bind-address</code> properties.</td>

Reply via email to