diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2020-01-30 11:49:39 -0500 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2020-01-30 11:49:39 -0500 |
| commit | ae2142b60611311f15beddfdcf778de06179998f (patch) | |
| tree | 7ec694e18b34b86f1277b546f982eb433dc5127c /tls-init-container/dcae-cert-setup.sh | |
| parent | ee9a860cc1b79438f7de2e53a96b28cf12b8bffe (diff) | |
Remove trailing newline in password files2.0.1
Issue-ID: DCAEGEN2-2039
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I5b54b6cbc45b0cec129e5ff1d6894c1d64bd3d49
Diffstat (limited to 'tls-init-container/dcae-cert-setup.sh')
| -rwxr-xr-x | tls-init-container/dcae-cert-setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tls-init-container/dcae-cert-setup.sh b/tls-init-container/dcae-cert-setup.sh index 7f3b601..da52569 100755 --- a/tls-init-container/dcae-cert-setup.sh +++ b/tls-init-container/dcae-cert-setup.sh @@ -53,10 +53,10 @@ rm -f ${TARGET}/* /opt/app/aaf_config/bin/agent.sh # Extract the p12 and JKS passwords -/opt/app/aaf_config/bin/agent.sh aafcli showpass ${APP_FQI} ${aaf_locator_fqdn} | grep cadi_keystore_password_p12 | cut -d '=' -f 2- > /opt/app/osaaf/p12.pass -/opt/app/aaf_config/bin/agent.sh aafcli showpass ${APP_FQI} ${aaf_locator_fqdn} | grep cadi_keystore_password_jks= | cut -d '=' -f 2- > /opt/app/osaaf/jks.pass +/opt/app/aaf_config/bin/agent.sh aafcli showpass ${APP_FQI} ${aaf_locator_fqdn} | grep cadi_keystore_password_p12 | cut -d '=' -f 2- | tr -d '\n' > /opt/app/osaaf/p12.pass +/opt/app/aaf_config/bin/agent.sh aafcli showpass ${APP_FQI} ${aaf_locator_fqdn} | grep cadi_keystore_password_jks= | cut -d '=' -f 2- | tr -d '\n' > /opt/app/osaaf/jks.pass # AAF provides a truststore password, but it appears that the truststore is not password-protected -/opt/app/aaf_config/bin/agent.sh aafcli showpass ${APP_FQI} ${aaf_locator_fqdn} | grep cadi_truststore_password= | cut -d '=' -f 2- > /opt/app/osaaf/trust.pass +/opt/app/aaf_config/bin/agent.sh aafcli showpass ${APP_FQI} ${aaf_locator_fqdn} | grep cadi_truststore_password= | cut -d '=' -f 2- | tr -d '\n' > /opt/app/osaaf/trust.pass # Copy the p12 and JKS artifacts to target directory and rename according to DCAE conventions cp ${ARTIFACTS}/${AAFNS}.p12 ${TARGET}/cert.p12 |