diff options
| author |   varun gudisena <vg411h@att.com> | 2018-08-23 23:07:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-23 23:07:43 +0000 |
| commit | a6c8596ac600c5cd25ed8af1c420a414e1bcd916 (patch) | |
| tree | e67468d04f5af7264d9e5654ad49aafee4ced095 | |
| parent | b8a8129f13ba7a986b4937ff64645e466078a003 (diff) | |
| parent | aeb80c8242c6c2d2483c6c396731f455fb841799 (diff) | |
Merge "CA Bootstrapping"
| -rw-r--r-- | auth/docker/aaf.sh | 7 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 3 | ||||
| -rw-r--r-- | auth/sample/bin/service.sh | 5 | ||||
| -rw-r--r-- | auth/sample/local/org.osaaf.aaf.cm.ca.props | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index c41192fe..5e70403f 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -15,6 +15,10 @@ function run_it() { /bin/bash $PARAMS } +function set_prop() { +docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2" "$3" +} + function encrypt_it() { docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2" } @@ -44,6 +48,9 @@ if [ "$(docker volume ls | grep aaf_config)" = "" ] && [ ${P12_LOAD} = "yes" ]; docker container cp ${AAF_INITIAL_X509_P12} aaf_config_$USER:/opt/app/osaaf/local/org.osaaf.aaf.p12 docker container cp ${AAF_SIGNER_P12} aaf_config_$USER:/opt/app/osaaf/local/org.osaaf.aaf.signer.p12 + set_prop cm_ca.local "${CM_CA_LOCAL}" org.osaaf.aaf.cm.ca.props + set_prop cadi_x509_issuers "${CADI_X509_ISSUERS}" org.osaaf.aaf.props + encrypt_it cadi_keystore_password "${AAF_INITIAL_X509_PASSWORD}" encrypt_it cm_ca.local "${AAF_SIGNER_PASSWORD}" diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 7b9cd13c..68b06ef4 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -18,6 +18,7 @@ LATITUDE= LONGITUDE= # # Initial AAF Certificate (not Generated) +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= @@ -25,3 +26,5 @@ CADI_X509_ISSUERS= # CA info (leave blank unless functioning as CA) AAF_SIGNER_P12= AAF_SIGNER_PASSWORD= +CM_CA_LOCAL= + diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index 15c3714d..33dca67f 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -89,9 +89,10 @@ if [ ! "$CMD" = "" ]; then for F in $FILES; do echo "Changing $1 in $F" if [ "$ADD" = "Y" ]; then - echo $2 >> $F + echo "$1=$2" >> $F else - sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F + VALUE=${2//\//\\\/} + sed -i.backup -e "s/\(${1}=\).*/\1${VALUE}/" $F fi cat $F done diff --git a/auth/sample/local/org.osaaf.aaf.cm.ca.props b/auth/sample/local/org.osaaf.aaf.cm.ca.props index 98e16ce7..b21cf355 100644 --- a/auth/sample/local/org.osaaf.aaf.cm.ca.props +++ b/auth/sample/local/org.osaaf.aaf.cm.ca.props @@ -4,7 +4,7 @@ ## #Certman -cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.signer.p12;aaf_intermediate_9;enc: +cm_ca.local= cm_ca.local.idDomains=org.osaaf cm_ca.local.baseSubject=/OU=OSAAF/O=ONAP/C=US cm_ca.local.perm_type=org.osaaf.aaf.ca |