diff options
Diffstat (limited to 'docker/docker_be')
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb | 6 | ||||
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore | bin | 4255 -> 0 bytes | |||
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 | bin | 0 -> 4051 bytes | |||
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks | bin | 0 -> 1413 bytes | |||
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore | bin | 4255 -> 0 bytes | |||
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb | 8 | ||||
-rw-r--r-- | docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb index 19d401e..921fde1 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb @@ -13,9 +13,9 @@ default['SDC']['BE']['http_port'] = 8080 default['SDC']['BE']['https_port'] = 8443 default['DCAE']['TOSCA_LAB']['https_port'] = 8085 -default['jetty']['keystore_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" -default['jetty']['keymanager_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" -default['jetty']['truststore_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" +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['disableHttp'] = true diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore Binary files differdeleted file mode 100644 index c408393..0000000 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/keystore +++ /dev/null diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 Binary files differnew file mode 100644 index 0000000..ee000dc --- /dev/null +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.p12 diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks Binary files differnew file mode 100644 index 0000000..342c4f2 --- /dev/null +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/org.onap.sdc.trust.jks diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore Binary files differdeleted file mode 100644 index c408393..0000000 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore +++ /dev/null diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb index 5071b47..43919ed 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/jetty_setup.rb @@ -22,16 +22,16 @@ end # Create Keystore -cookbook_file "/#{jetty_base}/etc/keystore" do - source "keystore" +cookbook_file "/#{jetty_base}/etc/org.onap.sdc.p12" do + source "org.onap.sdc.p12" owner "jetty" group "jetty" mode 0755 end # Create Truststore -cookbook_file "/#{jetty_base}/etc/truststore" do - source "truststore" +cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do + source "org.onap.sdc.trust.jks" owner "jetty" group "jetty" mode 0755 diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb index 9abac51..278fdea 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/ssl-ini.erb @@ -42,10 +42,10 @@ jetty.ssl.port=<%= @https_port %> ## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html ## Keystore file path (relative to $jetty.base) -#jetty.sslContext.keyStorePath=etc/keystore +jetty.sslContext.keyStorePath=etc/org.onap.sdc.p12 ## Truststore file path (relative to $jetty.base) -#jetty.sslContext.trustStorePath=etc/truststore +jetty.sslContext.trustStorePath=etc/org.onap.sdc.trust.jks ## Keystore password # jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 |