From 7ddcf0ffa5470a0a0c1e0221f81cb0a4acf142c7 Mon Sep 17 00:00:00 2001 From: "r.bogacki" Date: Mon, 19 Aug 2019 10:16:23 +0200 Subject: HTTPS calls for catalog-fe Implemented HTTPS calls into catalog-fe -Added p12 keystore certificate. -Updated application configuration. -Added trust-store. Issue-ID: SDC-2516 Signed-off-by: Robert Bogacki Change-Id: I6c36598dd7df8be85e99619ab7004ceed905f6e1 --- .../cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb | 7 +++++-- .../cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default') diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb index d09880d825..fed19d1aa2 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb @@ -1,8 +1,11 @@ #!/bin/bash - +<% if node[:disableHttp] -%> +health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' https://127.0.0.1:<%= @ssl_port %>/sdc1/rest/healthCheck) +<% else %> health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8181/sdc1/rest/healthCheck) +<% end -%> if [[ "$health_Check_http_code" -eq 200 ]]; then exit 0 else exit $health_Check_http_code -fi \ No newline at end of file +fi diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb index 70bf6d6d27..278fdea2ae 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ssl-ini.erb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/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 -- cgit 1.2.3-korg