This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1086
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1086 by this push:
new 335643d fixed typo
335643d is described below
commit 335643d3804e50e97a6941b4a492b6e56ac4a594
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Sep 11 17:40:36 2019 +0300
fixed typo
---
.../helm_charts/dlab-ui-chart/templates/configmap-ui-conf.yaml | 2 +-
services/self-service/entrypoint_gcp.sh | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
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 809f099..6363c4c 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
@@ -35,7 +35,7 @@ data:
<#assign TRUST_STORE_PASSWORD="changeit">
# Available options are aws, azure, gcp
- <#assign CLOUD_TYPE="aws">
+ <#assign CLOUD_TYPE="gcp">
cloudProvider: ${CLOUD_TYPE}
#Switch on/off developer mode here
diff --git a/services/self-service/entrypoint_gcp.sh
b/services/self-service/entrypoint_gcp.sh
index b05dbb1..2bc54c4 100644
--- a/services/self-service/entrypoint_gcp.sh
+++ b/services/self-service/entrypoint_gcp.sh
@@ -1,10 +1,12 @@
#!/bin/sh
mkdir -p /root/keys
-keytool -genkeypair -alias dlab -keyalg RSA -validity 730 -storepass password \
+/usr/bin/keytool -genkeypair -alias dlab -keyalg RSA -validity 730 -storepass
password \
-keypass password -keystore /root/keys/ssn.keystore.jks \
-keysize 2048 -dname "CN=localhost"
-keytool -exportcert -alias dlab -storepass password -file /root/keys/ssn.crt \
+/usr/bin/keytool -exportcert -alias dlab -storepass password -file
/root/keys/ssn.crt \
-keystore /root/keys/ssn.keystore.jks
+/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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
