diff options
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
4 files changed, 26 insertions, 15 deletions
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb index 23ed9ba156..ea2d9033ab 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb @@ -11,7 +11,11 @@ beHttpPort: <%= @catalog_port %> beContext: /sdc2/rest/v1/catalog/upload/resources # catalog backend protocol +<% if node[:disableHttp] -%> +beProtocol: https +<% else %> beProtocol: http +<% end -%> # catalog backend ssl port beSslPort: <%= @ssl_port %> @@ -22,20 +26,31 @@ threadpoolSize: 50 # request processing timeout (seconds) requestTimeout: 10 +# Determines the health check read timeout when invoking health check towards the LB (or BE whatever is configured): healthCheckSocketTimeoutInMs: 5000 healthCheckIntervalInSeconds: 5 onboarding: - protocol: http - host: <%= @fe_host_ip %> - port: 8181 - healthCheckUri: "/onboarding/v1.0/healthcheck" + host: <%= @fe_host_ip %> + <% if node[:disableHttp] -%> + protocol: https + port: <%= node['FE'][:https_port] %> + <% else %> + protocol: http + port: <%= node['FE'][:http_port] %> + <% end -%> + healthCheckUri: "/onboarding/v1.0/healthcheck" dcae: + host: <%= @fe_host_ip %> + <% if node[:disableHttp] -%> + protocol: https + port: <%= node['FE'][:https_port] %> + <% else %> protocol: http - host: localhost - port: 8181 + port: <%= node['FE'][:http_port] %> + <% end -%> healthCheckUri: "/dcae/healthCheck" identificationHeaderFields: @@ -48,9 +63,6 @@ identificationHeaderFields: - - &HTTP_CSP_ATTUID HTTP_CSP_ATTUID - &csp-attuid csp-attuid - - - - &HTTP_CSP_WSTYPE HTTP_CSP_WSTYPE - - &csp-wstype csp-wstype optionalHeaderFields: - diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb index 34a73fdf55..233a6b8852 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-http-ini.erb @@ -27,6 +27,3 @@ jetty.http.idleTimeout=30000 ## Thread priority delta to give to acceptor threads # jetty.http.acceptorPriorityDelta=0 - -## HTTP Compliance: RFC7230, RFC2616, LEGACY -# jetty.http.compliance=RFC7230 diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb index f8ca5252b0..d2542fc360 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-https-ini.erb @@ -11,5 +11,3 @@ jetty.https.idleTimeout=300000 # HTTPS Socket.soLingerTime in seconds. (-1 to disable) # https.soLingerTime=-1 - - diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb index 4646661dfb..71ed876ee7 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-onboarding-configuration.yaml.erb @@ -2,4 +2,8 @@ notifications: pollingIntervalMsec: 2000 selectionSize: 100 beHost: <%= @catalog_ip %> - beHttpPort: <%= @catalog_port %>
\ No newline at end of file + <% if node[:disableHttp] -%> + beHttpPort: <%= node['BE'][:https_port] %> + <% else %> + beHttpPort: <%= node['BE'][:http_port] %> + <% end -%>
\ No newline at end of file |