From 429ce918c2e3409b277330f99c235d44ccd3538a Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Fri, 13 Dec 2024 16:07:39 +0100
Subject: [PATCH] #2 OZG-7121 Fix keystore truststore from tls secret
---
.../keystore-truststore-from-tls-secret.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/store/keystore-truststore-from-tls-secret.sh b/src/main/resources/store/keystore-truststore-from-tls-secret.sh
index 1c89348..750a054 100755
--- a/src/main/resources/store/keystore-truststore-from-tls-secret.sh
+++ b/src/main/resources/store/keystore-truststore-from-tls-secret.sh
@@ -1,17 +1,17 @@
#!/bin/sh
-IN_CA_CRT=${IN_CA_CRT-:/tls/ca.crt}
-IN_TLS_KEY=${IN_TLS_KEY-:/tls/tls.key}
-IN_TLS_CRT=${IN_TLS_CRT-:/tls/tls.crt}
+IN_CA_CRT=${IN_CA_CRT:-/tls/ca.crt}
+IN_TLS_KEY=${IN_TLS_KEY:-/tls/tls.key}
+IN_TLS_CRT=${IN_TLS_CRT:-/tls/tls.crt}
-OUT_JKS_TRUSTSTORE=${OUT_JKS_TRUSTSTORE-:/store/truststore.jks}
-OUT_JKS_TRUSTSTORE_KEY_ALIAS=${OUT_JKS_TRUSTSTORE_KEY_ALIAS-:xta-test-root-ca}
-OUT_JKS_TRUSTSTORE_KEY_PASSWORD=${OUT_JKS_TRUSTSTORE_KEY_PASSWORD-:password}
+OUT_JKS_TRUSTSTORE=${OUT_JKS_TRUSTSTORE:-/store/truststore.jks}
+OUT_JKS_TRUSTSTORE_KEY_ALIAS=${OUT_JKS_TRUSTSTORE_KEY_ALIAS:-xta-test-root-ca}
+OUT_JKS_TRUSTSTORE_KEY_PASSWORD=${OUT_JKS_TRUSTSTORE_KEY_PASSWORD:-password}
echo "[1.0] Create $OUT_JKS_TRUSTSTORE from $IN_CA_CRT"
keytool -importcert -alias "$OUT_JKS_TRUSTSTORE_KEY_ALIAS" -keystore "$OUT_JKS_TRUSTSTORE" -storetype JKS -storepass "$OUT_JKS_TRUSTSTORE_KEY_PASSWORD" -file "$IN_CA_CRT" -noprompt
-OUT_P12_KEYSTORE=${OUT_P12_KEYSTORE-:/store/keystore.p12}
-OUT_P12_KEYSTORE_KEY_ALIAS=${OUT_P12_KEYSTORE_KEY_ALIAS-:xta-test-server}
-OUT_P12_KEYSTORE_KEY_PASSWORD=${OUT_P12_KEYSTORE_KEY_PASSWORD-:password}
+OUT_P12_KEYSTORE=${OUT_P12_KEYSTORE:-/store/keystore.p12}
+OUT_P12_KEYSTORE_KEY_ALIAS=${OUT_P12_KEYSTORE_KEY_ALIAS:-xta-test-server}
+OUT_P12_KEYSTORE_KEY_PASSWORD=${OUT_P12_KEYSTORE_KEY_PASSWORD:-password}
echo "[2.0] Create $OUT_P12_KEYSTORE from $IN_TLS_KEY and $IN_TLS_CRT"
openssl pkcs12 -export -in "$IN_TLS_CRT" -inkey "$IN_TLS_KEY" -out "$OUT_P12_KEYSTORE" -name "$OUT_P12_KEYSTORE_KEY_ALIAS" -passout "pass:$OUT_P12_KEYSTORE_KEY_PASSWORD"
\ No newline at end of file
--
GitLab