From 1e8b38324fc1a9f73285ce2b07b6945db528d208 Mon Sep 17 00:00:00 2001 From: "r.bogacki" Date: Mon, 19 Aug 2019 10:43:05 +0200 Subject: HTTPS calls for webseal-simulator Implemented HTTPS calls into webseal-simulator -Added p12 keystore certificate. -Updated application configuration. Issue-ID: SDC-2517 Signed-off-by: Robert Bogacki Change-Id: Ieb5f9ec5a0e409eb4bad36f708b2eec424ecf70b --- .../cookbooks/sdc-simulator/files/default/keystore | Bin 1416 -> 0 bytes .../sdc-simulator/files/default/org.onap.sdc.p12 | Bin 0 -> 4051 bytes .../recipes/SDC_Simulator_4_locate_keystore.rb | 6 +++--- .../recipes/SDC_Simulator_5_create_jetty_modules.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore create mode 100644 utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore deleted file mode 100644 index 08f6cda8a7..0000000000 Binary files a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/keystore and /dev/null differ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 new file mode 100644 index 0000000000..ee000dc749 Binary files /dev/null and b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/org.onap.sdc.p12 differ diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb index 3bb482d89a..8358e28339 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_4_locate_keystore.rb @@ -8,9 +8,9 @@ directory "Jetty_etcdir_creation" do action :create end -cookbook_file "/#{jetty_base}/etc/keystore" do - source "keystore" +cookbook_file "/#{jetty_base}/etc/org.onap.sdc.trust.jks" do + source "org.onap.sdc.trust.jks" owner "jetty" group "jetty" mode 0755 -end \ No newline at end of file +end diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb index 8a0f6a79c2..4f7e710d63 100644 --- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb +++ b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/recipes/SDC_Simulator_5_create_jetty_modules.rb @@ -18,8 +18,8 @@ template "ssl-ini" do mode "0755" variables({ :https_port => "8443", - :jetty_keystore_pwd => "OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4", - :jetty_keymanager_pwd => "OBF:1u2u1wml1z7s1z7a1wnl1u2g" + :jetty_keystore_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng", + :jetty_keymanager_pwd => "rTIS;B4kM]2GHcNK2c3B4&Ng" }) end -- cgit 1.2.3-korg