diff options
Diffstat (limited to 'openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes')
-rw-r--r-- | openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb index 6b2b79b49c..2e51402016 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_4_setup_jetty_modules.rb @@ -1,4 +1,4 @@ -#Set the http module option +# Set the http module option if node['disableHttp'] http_option = "#--module=http" else @@ -18,12 +18,11 @@ template "http-ini" do group "#{ENV['JETTY_GROUP']}" mode "0755" variables ({ - :http_option => http_option , + :http_option => http_option, :http_port => "#{node['ONBOARDING_BE'][:http_port]}" }) - -end +end template "https-ini" do path "#{ENV['JETTY_BASE']}/start.d/https.ini" @@ -34,7 +33,6 @@ template "https-ini" do variables :https_port => "#{node['ONBOARDING_BE'][:https_port]}" end - template "ssl-ini" do path "#{ENV['JETTY_BASE']}/start.d/ssl.ini" source "ssl-ini.erb" @@ -42,9 +40,11 @@ template "ssl-ini" do group "#{ENV['JETTY_GROUP']}" mode "0755" variables ({ - :https_port => "#{node['ONBOARDING_BE'][:https_port]}" , - :jetty_keystore_pwd => "#{node['jetty'][:keystore_pwd]}" , - :jetty_keymanager_pwd => "#{node['jetty'][:keymanager_pwd]}" , + :https_port => "#{node['ONBOARDING_BE'][:https_port]}", + :jetty_keystore_path => "#{node['jetty'][:keystore_path]}", + :jetty_keystore_pwd => "#{node['jetty'][:keystore_pwd]}", + :jetty_keymanager_pwd => "#{node['jetty'][:keymanager_pwd]}", + :jetty_truststore_path => "#{node['jetty'][:truststore_path]}", :jetty_truststore_pwd => "#{node['jetty'][:truststore_pwd]}" }) end |