You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/10/25 16:57:46 UTC
[incubator-dlab] branch DLAB-1158 updated: fixed issue with certs
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new ebe5a99 fixed issue with certs
ebe5a99 is described below
commit ebe5a9959225a5882bc4bab9631b2b6fa423b3f5
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Oct 25 19:57:36 2019 +0300
fixed issue with certs
---
services/self-service/entrypoint_aws.sh | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/services/self-service/entrypoint_aws.sh b/services/self-service/entrypoint_aws.sh
index 923b730..57bf18a 100644
--- a/services/self-service/entrypoint_aws.sh
+++ b/services/self-service/entrypoint_aws.sh
@@ -12,13 +12,11 @@
#/usr/bin/keytool -importcert -trustcacerts -file /root/keys/endpoint.crt -noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
if [ -d "/root/step-certs" ]; then
- /bin/mkdir -p /root/dlab-certs
- cp -rf /root/step-certs/* /root/dlab-certs/
- /usr/bin/keytool -importcert -trustcacerts -alias step-ca -file /root/dlab-certs/ca.crt -noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
- /usr/bin/keytool -importcert -trustcacerts -alias step-crt -file /root/dlab-certs/tls.crt -noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
+ /usr/bin/keytool -importcert -trustcacerts -alias step-ca -file /root/step-certs/ca.crt -noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
+ /usr/bin/keytool -importcert -trustcacerts -alias step-crt -file /root/step-certs/tls.crt -noprompt -storepass changeit -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts
fi
-/usr/bin/openssl pkcs12 -export -in /root/dlab-certs/tls.crt -inkey /root/dlab-certs/tls.key -out dlab.p12 -password pass:changeit
+/usr/bin/openssl pkcs12 -export -in /root/step-certs/tls.crt -inkey /root/step-certs/tls.key -out dlab.p12 -password pass:changeit
/usr/bin/keytool -importkeystore -srckeystore dlab.p12 -srcstoretype PKCS12 -destkeystore /root/keys/ssn.keystore.jks -deststoretype JKS -storepass "${SSN_KEYSTORE_PASSWORD}" -srcstorepass changeit -keypass "${SSN_KEYSTORE_PASSWORD}"
/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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org