summaryrefslogtreecommitdiffstats
path: root/auth/sample
diff options
context:
space:
mode:
Diffstat (limited to 'auth/sample')
-rw-r--r--auth/sample/bin/service.sh21
-rw-r--r--auth/sample/local/aaf.props1
2 files changed, 12 insertions, 10 deletions
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index a4d2aba1..29d9f967 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -81,6 +81,14 @@ if [ ! -e $FILE ]; then
INITIALIZED="true"
fi
+# Should we clean up?
+if [ ! -e "${LOCAL}/VERSION" ] || [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then
+ echo "Clean up directory ${LOCAL}"
+ rm -Rf ${LOCAL}/org.osaaf.aaf.*props ${LOCAL}/org.osaaf.aaf.p12
+ ls ${LOCAL}
+fi
+echo "${VERSION}" > $LOCAL/VERSION
+
# Load up Cert/X509 Artifacts
# echo "Check Signer Keyfile"
FILE="$LOCAL/org.osaaf.aaf.signer.p12"
@@ -99,19 +107,11 @@ if [ ! -e $FILE ]; then
ln -s $PUBLIC/truststoreONAPall.jks $LOCAL
cp $CONFIG/cert/AAF_RootCA.cer $PUBLIC
CM_TRUST_CAS="$PUBLIC/AAF_RootCA.cer"
- echo "cadi_keystore_password=something easy" >> $CONFIG/local/aaf.props
echo "Setup ONAP Test CAs and Signers"
INITIALIZED="true"
fi
fi
-# Should we clean up?
-if [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then
- echo "Clean up directory ${LOCAL}"
- rm -Rf ${LOCAL}/*
-fi
-echo "${VERSION}" > $LOCAL/VERSION
-
FILE="$LOCAL/org.osaaf.aaf.p12"
if [ ! -e $FILE ]; then
if [ -e $CONFIG/cert/org.osaaf.aaf.p12 ]; then
@@ -122,8 +122,9 @@ if [ ! -e $FILE ]; then
echo "Bootstrap Creation of Keystore from Signer"
cd $CONFIG/CA
- # Remove this after Casablanca
- CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+ # Redo all of this after Dublin
+ export cadi_x509_issuers="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+ export signer_subj="/CN=intermediateCA_9/OU=OSAAF/O=ONAP/C=US"
bash bootstrap.sh $LOCAL/org.osaaf.aaf.signer.p12 'something easy'
cp aaf.bootstrap.p12 $FILE
if [ -n "$CADI_X509_ISSUERS" ]; then
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 4eb70a9b..022ca4eb 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -31,6 +31,7 @@ aaf_default_realm=people.osaaf.org
aaf_password=startup
cadi_alias=aaf@aaf.osaaf.org
cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12
+cadi_keystore_password=something easy
cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks
cadi_truststore_password=changeit
cadi_x509_issuers=