summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-01-22 21:42:13 +0100
committerJose <jose@zeroc.com>2013-01-22 21:42:13 +0100
commit38b56d63851cad88495b7795a0c41343b5769f30 (patch)
treeac50e93c69cbe0a6fc44c1aae68f7566a42d3c9f /cpp
parentWindows RT ARM support (diff)
downloadice-38b56d63851cad88495b7795a0c41343b5769f30.tar.bz2
ice-38b56d63851cad88495b7795a0c41343b5769f30.tar.xz
ice-38b56d63851cad88495b7795a0c41343b5769f30.zip
ICE-5091 - IceGrid/secure demo needs admin key
Added clarifications to the demo README Fixed Java configuration in config.admin
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/IceGrid/secure/README13
-rw-r--r--cpp/demo/IceGrid/secure/config.admin2
2 files changed, 13 insertions, 2 deletions
diff --git a/cpp/demo/IceGrid/secure/README b/cpp/demo/IceGrid/secure/README
index d4e6d458e85..ee371e37d76 100644
--- a/cpp/demo/IceGrid/secure/README
+++ b/cpp/demo/IceGrid/secure/README
@@ -67,7 +67,18 @@ IceSSL.VerifyPeer=1
which means that a client, such IceGrid Admin, does not need to
provide a X.509 certificate. As a result, connecting with IceGrid
Admin is straightforward: you just need to create a SSL connection
-with no associated X.509 certificate.
+with no associated X.509 certificate.
+
+When using IceGrid Admin is recommended to import certs/certs.jks
+in the IceGrid Admin trusted CAs Key Store using the IceGrid Admin
+certificate manager, to ensure you IceGrid Admin connects to the
+right IceGrid Registry or Glacier2 Router.
+
+The icegridadmin command line tool configuration in config.admin
+sets the property "IceSSL.CertAuthFile=ca_cert.pem" to ensure that
+the admin client is connecting to the correct registry or
+glacier2router. In a Java client "IceSSL.Truststore=certs.jks"
+can be used for the same purpose.
The IceGrid registry and Glacier2 router are configured to use the
"null permissions verifier" so you can use any username/password to
diff --git a/cpp/demo/IceGrid/secure/config.admin b/cpp/demo/IceGrid/secure/config.admin
index 77c39fe0e50..7f8dd2eb7c6 100644
--- a/cpp/demo/IceGrid/secure/config.admin
+++ b/cpp/demo/IceGrid/secure/config.admin
@@ -23,4 +23,4 @@ IceSSL.CertAuthFile=ca_cert.pem
# Java configuration
Ice.Plugin.IceSSL.java=IceSSL.PluginFactory
IceSSL.Alias=ca_cert
-IceSSL.Keystore=certs.jks
+IceSSL.Truststore=certs.jks