diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-11-14 17:55:41 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-11-14 17:55:41 +0000 |
| commit | 01f0537203f954f1d871329065eb664dea3fd254 (patch) | |
| tree | 3444947d157e091b7f57204533eab1126a82ce36 | |
| parent | 125ecf4977236ad4b67e2df117fe6261ed387a63 (diff) | |
| download | qpid-python-01f0537203f954f1d871329065eb664dea3fd254.tar.gz | |
QPID-2942: disable management SSL by default, update config.xml to use keystore path from example keystore creation script and move systest keystore config to the systest config override file.
merged from trunk r1035026
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.8-release-candidates@1035032 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker/etc/config.xml | 7 | ||||
| -rw-r--r-- | qpid/java/systests/etc/config-systests-settings.xml | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index 87101678c0..d9677c9cf6 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -53,9 +53,10 @@ <enabled>true</enabled> <jmxport>8999</jmxport> <ssl> - <enabled>true</enabled> - <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore --> - <keyStorePath>${prefix}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath> + <enabled>false</enabled> + <!-- Update below path to your keystore location, or run the bin/create-example-ssl-stores(.sh|.bat) + script from within the etc/ folder to generate an example store with self-signed cert --> + <keyStorePath>${conf}/qpid.keystore</keyStorePath> <keyStorePassword>password</keyStorePassword> </ssl> </management> diff --git a/qpid/java/systests/etc/config-systests-settings.xml b/qpid/java/systests/etc/config-systests-settings.xml index a7f538aec1..751ff133cb 100644 --- a/qpid/java/systests/etc/config-systests-settings.xml +++ b/qpid/java/systests/etc/config-systests-settings.xml @@ -24,6 +24,8 @@ <enabled>false</enabled> <ssl> <enabled>false</enabled> + <keyStorePath>${QPID_HOME}/../test-profiles/test_resources/ssl/keystore.jks</keyStorePath> + <keyStorePassword>password</keyStorePassword> </ssl> </management> <virtualhosts>${QPID_HOME}/etc/virtualhosts-systests.xml</virtualhosts> |