X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fsample%2Fbin%2Fservice.sh;h=2fd49cacbbef38b8977a3b7d3ac475e212ec0ea6;hb=96bf6a2771dfe992fb27bd6361d191d83b6ff605;hp=a4d2aba14e1057910432bc7b65828544c8551502;hpb=f64f482462b697e06a47ad55aa5447dc829ce727;p=aaf%2Fauthz.git

diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index a4d2aba1..2fd49cac 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -33,13 +33,13 @@ echo "# Properties passed in"
 
 # Set from CAP Based PROPS, if necessary
 aaf_env=${aaf_env:-"${AAF_ENV}"}
-aaf_release=${aaf_release:-"${VERSION}"}
+aaf_deployed_version=${aaf_deployed_version:-"${VERSION}"}
 cadi_latitude=${cadi_latitude:-"${LATITUDE}"}
 cadi_longitude=${cadi_longitude:-"${LONGITUDE}"}
 cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"}
 aaf_locate_url=${aaf_locate_url:-"https://${HOSTNAME}:8095"}
 
-JAVA=/usr/bin/java
+JAVA=${JAVA_HOME}/bin/java
 
 OSAAF=/opt/app/osaaf
 LOCAL=$OSAAF/local
@@ -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
@@ -157,7 +158,6 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
 	echo "$S" >> ${TMP}
       fi
     done
-
     cat $TMP
 
     $JAVA_AGENT config \
@@ -167,6 +167,7 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
         cadi_longitude=${cadi_longitude} \
         cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
     rm ${TMP}
+    echo "cm_always_ignore_ips=${cm_always_ignore_ips:=false}" >> $LOCAL/org.osaaf.aaf.props;
 
     # Cassandra Config stuff
     # Default is expect a Cassandra on same Node
@@ -192,6 +193,10 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
     fi
     echo "Created AAF Initial Configurations"
     INITIALIZED="true"
+    if [ -n ${DUSER} ]; then
+      mkdir -p /opt/app/osaaf/logs
+      chown -R 1000:1000 /opt/app/aaf /opt/app/osaaf
+    fi
 fi