AAF Services non root, all platforms

[aaf/authz.git] / auth / auth-cass / cass_init / restore.sh

diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh
index c11865b..0bf0ea6 100644 (file)
--- a/auth/auth-cass/cass_init/restore.sh
+++ b/auth/auth-cass/cass_init/restore.sh
@@ -4,7 +4,7 @@
 echo `date`
 ENV=DOCKER
 
-CQLSH="/usr/bin/cqlsh -k authz"
+CQLSH="${CQLSH:=/usr/bin/cqlsh} -k authz"
 
 cd dats
 if [ "$*" = "" ]; then
@@ -35,7 +35,7 @@ for T in $DATA; do
     echo $T
     case "$T" in
       # 2.1.14 still has NULL problems for COPY.  Fixed in 2.1.15+
-      "approval"|"artifact"|"cred"|"ns"|"x509"|"role")
+      "approval"|"artifact"|"cred"|"ns"|"x509"|"role"|"notified")
         $CQLSH -e  "truncate $T"
         UPLOAD="$UPLOAD "$T
         ;;
@@ -52,7 +52,7 @@ done
 
 if [ ! "$UPLOAD" = "" ]; then
   cd dats
-  java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD
+  java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD 2>&1 logs/stdout
   cd -
 fi