diff options
| -rw-r--r-- | docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb | 7 | ||||
| -rw-r--r-- | docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 | bin | 4051 -> 4459 bytes | |||
| -rw-r--r-- | docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks | bin | 1413 -> 1413 bytes | |||
| -rw-r--r-- | docker/docker_be/startup.sh | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks | bin | 1413 -> 1413 bytes | |||
| -rw-r--r-- | docker/docker_tools/startup.sh | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb index af6ad1e..ce88cdb 100644 --- a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb +++ b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/attributes/default.rb @@ -12,11 +12,12 @@ default['DCAE']['TOSCA_LAB']['http_port'] = 8085 default['SDC']['BE']['http_port'] = 8080 default['SDC']['BE']['https_port'] = 8443 default['DCAE']['TOSCA_LAB']['https_port'] = 8085 + +default['jetty'][:keystore_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" +default['jetty'][:keymanager_pwd] = "!ppJ.JvWn0hGh)oVF]([Kv)^" # TO CHANGE THE TRUSTSTORE CERT THE JVM CONFIGURATION # MUST BE ALSO CHANGE IN THE startup.sh FILE -default['jetty']['keystore_pwd'] = "rTIS;B4kM]2GHcNK2c3B4&Ng" -default['jetty']['keymanager_pwd'] = "rTIS;B4kM]2GHcNK2c3B4&Ng" -default['jetty']['truststore_pwd'] = "Y,f975ZNJfVZhV*{+Y[}pA?0" +default['jetty'][:truststore_pwd] = "].][xgtze]hBhz*wy]}m#lf*" default['disableHttp'] = true diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 Binary files differindex ee000dc..d03ca1c 100644 --- a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 +++ b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 diff --git a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks Binary files differindex 342c4f2..d07ce1a 100644 --- a/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks +++ b/docker/docker_be/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks diff --git a/docker/docker_be/startup.sh b/docker/docker_be/startup.sh index 60ba309..3a2814f 100644 --- a/docker/docker_be/startup.sh +++ b/docker/docker_be/startup.sh @@ -4,7 +4,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config \ -Dlog.home=${JETTY_BASE}/logs \ -Dlogback.configurationFile=${JETTY_BASE}/dcae-be/logback-spring.xml -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ - -Djavax.net.ssl.trustStorePassword=Y,f975ZNJfVZhV*{+Y[}pA?0 \ + -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf* \ -Djetty.console-capture.dir=${JETTY_BASE}/logs" cd /root/chef-solo diff --git a/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks Binary files differindex 077a7f3..d07ce1a 100755..100644 --- a/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks +++ b/docker/docker_tools/chef-repo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks diff --git a/docker/docker_tools/startup.sh b/docker/docker_tools/startup.sh index b9c3ea1..24e4347 100644 --- a/docker/docker_tools/startup.sh +++ b/docker/docker_tools/startup.sh @@ -4,7 +4,7 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} -Dconfig.home=${JETTY_BASE}/config \ -Dlog.home=${JETTY_BASE}/logs \ -Djetty.console-capture.dir=${JETTY_BASE}/logs \ -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ - -Djavax.net.ssl.trustStorePassword=c+QY7@v1bQ!lo0c4ydi)))AV" + -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf*" cd /root/chef-solo chef-solo -c solo.rb -E ${ENVNAME} |