From e9e5777db6edcbf34d3315a034ca9be2262fd61d Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Fri, 23 Aug 2019 16:46:49 +0200 Subject: Fully HTTPS support in the catalog-fe Fully HTTPS support: -Updated jvm configuration to support call to the SDC components using HTTPS. -Checkstyle in the recipes -Added buildRestClient method to create the CloseableHttpClient supporting the SSL connection -Sonar fixes in the PluginStatusBL class Issue-ID: SDC-2516 Signed-off-by: Krystian Kedron Change-Id: I35b9e22026898d2cc67a4b2d86d9d508a33fcb59 --- .../chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb | 1 - .../cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes') diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb index 67c511408c..f26418372b 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_4_logback.rb @@ -4,4 +4,3 @@ cookbook_file "#{ENV['JETTY_BASE']}/config/catalog-fe/logback.xml" do owner "jetty" group "jetty" end - diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb index b1c32b9506..bf756fb1c6 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_7_create_jetty_modules.rb @@ -23,7 +23,7 @@ template "http-ini" do owner "jetty" group "jetty" mode "0755" - variables ({ + variables({ :http_option => http_option , :http_port => "#{node['FE'][:http_port]}" }) @@ -46,7 +46,7 @@ template "ssl-ini" do owner "jetty" group "jetty" mode "0755" - variables ({ + variables({ :https_port => "#{node['FE'][:https_port]}" , :jetty_keystore_pwd => "#{node['jetty'][:keystore_pwd]}" , :jetty_keymanager_pwd => "#{node['jetty'][:keymanager_pwd]}" , -- cgit 1.2.3-korg