This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch DLAB-terraform in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push: new 430aac8 added ssl skip new fd11338 Merge remote-tracking branch 'origin/DLAB-terraform' into DLAB-terraform 430aac8 is described below commit 430aac82138b4d3672aff2bb945fcdaa678cdba4 Author: Oleh Martushevskyi <oleh_martushevs...@epam.com> AuthorDate: Mon Sep 16 16:24:14 2019 +0300 added ssl skip --- infrastructure-provisioning/src/ssn/templates/ssn.yml | 3 --- .../main/dlab-ui-chart/templates/configmap-ui-conf.yaml | 3 --- .../modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml | 3 --- services/billing-gcp/Dockerfile | 2 +- services/self-service/entrypoint_gcp.sh | 2 +- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/infrastructure-provisioning/src/ssn/templates/ssn.yml b/infrastructure-provisioning/src/ssn/templates/ssn.yml index a936884..1c30363 100644 --- a/infrastructure-provisioning/src/ssn/templates/ssn.yml +++ b/infrastructure-provisioning/src/ssn/templates/ssn.yml @@ -58,9 +58,6 @@ securityService: connectionTimeout: 20s provisioningService: - protocol: https - host: localhost - port: 8084 jerseyClient: timeout: 3s connectionTimeout: 3s diff --git a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml index 2b2607a..74f4041 100644 --- a/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml +++ b/infrastructure-provisioning/terraform/aws/ssn-helm-charts/main/dlab-ui-chart/templates/configmap-ui-conf.yaml @@ -66,9 +66,6 @@ data: connectionTimeout: 20s provisioningService: - protocol: https - host: {{ .Values.ui.provisionService.host }} - port: 8084 jerseyClient: timeout: 3s connectionTimeout: 3s diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml index 6363c4c..5de76a6 100644 --- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml +++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml @@ -66,9 +66,6 @@ data: connectionTimeout: 20s provisioningService: - protocol: https - host: {{ .Values.ui.provisionService.host }} - port: 8084 jerseyClient: timeout: 3s connectionTimeout: 3s diff --git a/services/billing-gcp/Dockerfile b/services/billing-gcp/Dockerfile index cd23ea7..a50ccda 100644 --- a/services/billing-gcp/Dockerfile +++ b/services/billing-gcp/Dockerfile @@ -25,4 +25,4 @@ USER root COPY billing-gcp-2.1.jar /root/ -CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 /root/billing-gcp-2.1.jar --spring.config.location=/root/billing.yml \ No newline at end of file +CMD java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Dcom.sun.net.ssl.checkRevocation=false /root/billing-gcp-2.1.jar --spring.config.location=/root/billing.yml \ No newline at end of file diff --git a/services/self-service/entrypoint_gcp.sh b/services/self-service/entrypoint_gcp.sh index 2bc54c4..d29afa6 100644 --- a/services/self-service/entrypoint_gcp.sh +++ b/services/self-service/entrypoint_gcp.sh @@ -9,4 +9,4 @@ mkdir -p /root/keys /usr/bin/keytool -importcert -trustcacerts -alias dlab -file /root/keys/ssn.crt -noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts -/usr/bin/java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 -DDLAB_CONF_DIR=/root/ /root/self-service-2.1.jar server /root/self-service.yml \ No newline at end of file +/usr/bin/java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Dcom.sun.net.ssl.checkRevocation=false -DDLAB_CONF_DIR=/root/ /root/self-service-2.1.jar server /root/self-service.yml \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org