summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
Diffstat (limited to 'auth')
-rw-r--r--auth/docker/aaf.sh9
-rw-r--r--auth/docker/d.props.init1
-rw-r--r--auth/sample/local/aaf.props2
3 files changed, 10 insertions, 2 deletions
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 "
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index 782f0c3f..7b9cd13c 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -20,6 +20,7 @@ LONGITUDE=
# Initial AAF Certificate (not Generated)
AAF_INITIAL_X509_P12=
AAF_INITIAL_X509_PASSWORD=
+CADI_X509_ISSUERS=
# CA info (leave blank unless functioning as CA)
AAF_SIGNER_P12=
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 71ba73a2..4a5d0716 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -15,7 +15,7 @@ cadi_alias=aaf@aaf.osaaf.org
cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12
cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks
cadi_truststore_password=changeit
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
+cadi_x509_issuers=
# Other
aaf_data_dir=/opt/app/osaaf/data