diff options
| author |   r.bogacki <r.bogacki@samsung.com> | 2019-08-19 10:16:23 +0200 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-08-20 15:19:09 +0000 |
| commit | 7ddcf0ffa5470a0a0c1e0221f81cb0a4acf142c7 (patch) | |
| tree | 522e9fd205ca771b75bbbedde86debbda04046e1 /catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates | |
| parent | d265e185c3868202d44690d76e1b578f19b5148f (diff) | |
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 <r.bogacki@samsung.com>
Change-Id: I6c36598dd7df8be85e99619ab7004ceed905f6e1
Diffstat (limited to 'catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates')
2 files changed, 7 insertions, 4 deletions
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 |