summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsu622b <sunil.unnava@att.com>2018-04-25 14:22:54 -0400
committersu622b <sunil.unnava@att.com>2018-04-25 14:24:31 -0400
commit61986ce57b32cb8ca7766c5207d34bd3c9b6595a (patch)
treed8c920f86945440138e829e1762205558bf0eedc
parent35b26080b50f47547640a4ef8c6aa284f3024a6f (diff)
Added the Keystore
Issue-ID: DMAAP-245 Change-Id: I8dde99c342c96b43fb475c8e6698222976d74853 Signed-off-by: su622b <sunil.unnava@att.com>
-rw-r--r--ajsc-shared-config/etc/keystore.jksbin2300 -> 3544 bytes
-rw-r--r--demo/docker_files/__docker-compose.yml2
-rw-r--r--demo/docker_files/keystore.jksbin0 -> 3544 bytes
-rw-r--r--src/main/config/ajsc-jetty.xml4
4 files changed, 3 insertions, 3 deletions
diff --git a/ajsc-shared-config/etc/keystore.jks b/ajsc-shared-config/etc/keystore.jks
index 3bfe928..da9297f 100644
--- a/ajsc-shared-config/etc/keystore.jks
+++ b/ajsc-shared-config/etc/keystore.jks
Binary files differ
diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index 2159781..1983ed7 100644
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -46,7 +46,7 @@ services:
volumes:
- ./MsgRtrApi.properties:/appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
- ./cadi.properties:/appl/dmaapMR1/etc/cadi.properties
- - ./mykey:/appl/dmaapMR1/etc/keyfile
+ - ./keystore.jks:/appl/dmaapMR1/bundleconfig/etc/keystore.jks
depends_on:
- zookeeper
- kafka
diff --git a/demo/docker_files/keystore.jks b/demo/docker_files/keystore.jks
new file mode 100644
index 0000000..da9297f
--- /dev/null
+++ b/demo/docker_files/keystore.jks
Binary files differ
diff --git a/src/main/config/ajsc-jetty.xml b/src/main/config/ajsc-jetty.xml
index 7a42776..ee626bb 100644
--- a/src/main/config/ajsc-jetty.xml
+++ b/src/main/config/ajsc-jetty.xml
@@ -87,8 +87,8 @@
<New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
<Set name="KeyStorePath"><SystemProperty name="AJSC_HOME" />/bundleconfig/etc/keystore.jks</Set>
- <Set name="KeyStorePassword">changeit</Set>
- <Set name="KeyManagerPassword">changeit</Set>
+ <Set name="KeyStorePassword">Messaging for All</Set>
+ <Set name="KeyManagerPassword">Messaging for All</Set>
</New>
<Call id="sslConnector" name="addConnector">
<Arg>