From b8a8129f13ba7a986b4937ff64645e466078a003 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 23 Aug 2018 16:32:45 -0500 Subject: Bootstrap Test fixes Issue-ID: AAF-419 Change-Id: I042c270498463b6eb853b0e3e496f49232868fb7 Signed-off-by: Instrumental --- auth/docker/aaf.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'auth/docker/aaf.sh') diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index efd4fe37..c41192fe 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -19,9 +19,13 @@ function encrypt_it() { docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2" } +function set_it() { + docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2" +} + P12_LOAD="no" -for PROP in AAF_INITIAL_X509_P12 AAF_INITIAL_X509_PASSWORD AAF_SIGNER_P12 AAF_SIGNER_PASSWORD; do +for PROP in AAF_INITIAL_X509_P12 AAF_INITIAL_X509_PASSWORD AAF_SIGNER_P12 AAF_SIGNER_PASSWORD CADI_X509_ISSUERS; do if [ "${!PROP}" != "" ]; then P12_LOAD='yes' break; @@ -43,6 +47,9 @@ if [ "$(docker volume ls | grep aaf_config)" = "" ] && [ ${P12_LOAD} = "yes" ]; encrypt_it cadi_keystore_password "${AAF_INITIAL_X509_PASSWORD}" encrypt_it cm_ca.local "${AAF_SIGNER_PASSWORD}" + set_it cadi_x509_issuers "${CADI_X509_ISSUERS}" + + echo -n "Stopping " docker container stop aaf_config_$USER echo -n "Removing " -- cgit 1.2.3-korg