Add Servlet Sample

[aaf/authz.git] / auth / sample / bin / service.sh

diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 43ef403..6b694ad 100644 (file)
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -7,9 +7,21 @@ LOCAL=/opt/app/osaaf/local
 DATA=/opt/app/osaaf/data
 PUBLIC=/opt/app/osaaf/public
 CONFIG=/opt/app/aaf_config
+
+# If doesn't exist... still create
+mkdir -p /opt/app/osaaf
+
 # Temp use for clarity of code
 FILE=
 
+# Setup Bash, first time only
+if [ ! -e "$HOME/.bash_aliases" ] || [ -z "$(grep aaf_config $HOME/.bash_aliases)" ]; then
+  echo "alias cadi='$CONFIG/bin/agent.sh EMPTY cadi \$*'" >>$HOME/.bash_aliases
+  echo "alias agent='$CONFIG/bin/agent.sh EMPTY \$*'" >>$HOME/.bash_aliases
+  chmod a+x $CONFIG/bin/agent.sh
+  . $HOME/.bash_aliases
+fi
+
 # Only load Identities once
 # echo "Check Identities"
 FILE="$DATA/identities.dat"
@@ -32,6 +44,8 @@ if [ ! -e $FILE ]; then
        base64 -d $CONFIG/cert/truststoreONAP.p12.b64 > $PUBLIC/truststoreONAP.p12 
        base64 -d $CONFIG/cert/truststoreONAPall.jks.b64 > $PUBLIC/truststoreONAPall.jks
        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        
     fi
 fi
@@ -58,6 +72,7 @@ if [ ! -e $FILE ]; then
        I=${BOOT_ISSUER##CN=};I=${I%%,*}
         CM_CA_PASS="something easy"
         CM_CA_LOCAL="org.onap.aaf.auth.cm.ca.LocalCA,$LOCAL/org.osaaf.aaf.signer.p12;aaf_intermediate_9;enc:"
+       CM_TRUST_CAS="$PUBLIC/AAF_RootCA.cer"
     fi
 fi
 
@@ -74,7 +89,8 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
     echo cadi_longitude=${LONGITUDE} >> ${TMP}
     echo cadi_x509_issuers=${CADI_X509_ISSUERS} >> ${TMP}
     echo aaf_register_as=${AAF_REGISTER_AS} >> ${TMP}
-    echo aaf_locate_url=https://${AAF_REGISTER_AS}:8095 >> ${TMP}
+    AAF_LOCATOR_AS=${AAF_LOCATOR_AS:=$AAF_REGISTER_AS}
+    echo aaf_locate_url=https://${AAF_LOCATOR_AS}:8095 >> ${TMP}
 
     cat $TMP
 
@@ -82,9 +98,17 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
         cadi_etc_dir=$LOCAL \
         cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
     rm ${TMP}
-    # Default Password for Default Cass
-    CASS_PASS=$("$JAVA" -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar cadi digest "cassandra" $LOCAL/org.osaaf.aaf.keyfile)
-    sed -i.backup -e "s/\\(cassandra.clusters.password=enc:\\)/\\1$CASS_PASS/" $LOCAL/org.osaaf.aaf.cassandra.props
+
+    # Cassandra Config stuff
+    # Default is expect a Cassandra on same Node
+    CASS_HOST=${CASS_HOST:="aaf_cass"}
+    CASS_PASS=$("$JAVA" -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar cadi digest "${CASSANDRA_PASSWORD:-cassandra}" $LOCAL/org.osaaf.aaf.keyfile)
+    CASS_NAME=${CASS_HOST/:*/}
+    sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTERS:=$CASS_HOST}/" \
+                  -e "s/\\(cassandra.clusters.user=\\).*/\\1${CASSANDRA_USER:=cassandra}/" \
+                  -e "s/\\(cassandra.clusters.password=enc:\\).*/\\1$CASS_PASS/" \
+                  -e "s/\\(cassandra.clusters.port=\\).*/\\1${CASSANDRA_PORT:=9042}/" \
+                  $LOCAL/org.osaaf.aaf.cassandra.props
 
     if [ -n "$CM_CA_LOCAL" ]; then
       if [ -n "$CM_CA_PASS" ]; then
@@ -95,6 +119,7 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
       mv $FILE $FILE.backup
       grep -v "cm_ca.local=" $FILE.backup > $FILE
       echo "cm_ca.local=$CM_CA_LOCAL" >> $FILE
+      echo "cm_trust_cas=$CM_TRUST_CAS" >> $FILE
     fi
 fi
 
@@ -138,12 +163,6 @@ if [ ! "$CMD" = "" ]; then
         echo Initializing ONAP configurations.
        ;;
     bash)
-        echo "alias agent='/bin/bash $CONFIG/bin/agent.sh EMPTY \$*'" >>~/.bashrc
-        if [ ! "$(grep aaf_config ~/.bashrc)" = "" ]; then
-            echo "alias cadi='/bin/bash $CONFIG/bin/agent.sh EMPTY cadi \$*'" >>~/.bashrc
-            echo "alias agent='/bin/bash $CONFIG/bin/agent.sh EMPTY \$*'" >>~/.bashrc
-            #. ~/.bashrc
-        fi
         shift
         cd $LOCAL || exit
         /bin/bash "$@"