From aeb80c8242c6c2d2483c6c396731f455fb841799 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 21 Aug 2018 10:24:08 -0500 Subject: CA Bootstrapping Issue-ID: AAF-419 Change-Id: I921604ab3bea2550ab12c1db43899a52ab91b166 Signed-off-by: Instrumental --- auth/sample/bin/service.sh | 5 +++-- auth/sample/local/aaf.props | 2 +- auth/sample/local/org.osaaf.aaf.cm.ca.props | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'auth/sample') 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/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 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 -- cgit 1.2.3-korg