summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/aaf.sh9
-rw-r--r--auth/docker/d.props.init1
2 files changed, 9 insertions, 1 deletions
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 50a79119..5e70403f 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -23,9 +23,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;
@@ -50,6 +54,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 "
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 484aba4b..68b06ef4 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -21,6 +21,7 @@ LONGITUDE=
CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US"
AAF_INITIAL_X509_P12=
AAF_INITIAL_X509_PASSWORD=
+CADI_X509_ISSUERS=
# CA info (leave blank unless functioning as CA)
AAF_SIGNER_P12=