Merged changes from one obsure branch,

renamed variables according to scripts used in deployment.

diff --git a/org.glite.jp.client/examples/glite-jp-importer.sh b/org.glite.jp.client/examples/glite-jp-importer.sh
index 02c79ee..804447e 100644 (file)
--- a/org.glite.jp.client/examples/glite-jp-importer.sh
+++ b/org.glite.jp.client/examples/glite-jp-importer.sh
@@ -1,51 +1,75 @@
 #! /bin/bash
 
 #
-# example script for purging LB and importing the dumps to JP
+# all-in-one example script for purging LB and importing the dumps to JP
 #
 
+GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
+GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
+
+[ -f /etc/glite.conf ] && . /etc/glite.conf
+[ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
+
+[ -f $GLITE_LOCATION/etc/jp.conf ] && . $GLITE_LOCATION/etc/jp.conf
+[ -f $GLITE_LOCATION_VAR/etc/jp.conf ] && . $GLITE_LOCATION_VAR/etc/jp.conf
+
+[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
+
+
 # job provenance server
-JBSERVER=umbar.ics.muni.cz:8901
+if [ -z "$GLITE_LB_EXPORT_JPPS" ]; then
+  echo "Please specify the Job Provanance Primary Storage server."
+  exit 1
+fi
 # bookkeeping server
-BKSERVER=scientific.civ.zcu.cz:9000
-# dump directory of bkserver (-D argument)
-BKSERVER_DUMPDIR=/tmp/dump
-# LB maildir for job registration (-J argument)
-BKSERVER_JOBREG_MAILDIR=/tmp/lb_server_jpreg
-
+if [ -z "$GLITE_LB_EXPORT_BKSERVER" ]; then
+  echo "Please specify the Book Keeping server."
+  exit 1
+fi
+# certificates
 if [ -z "$X509_USER_CERT" -o -z "$X509_USER_KEY" ]; then
   echo "Please set X509_USER_CERT and X509_USER_KEY."
   exit 1
 fi
+# dump directory of bkserver
+if [ -z "$GLITE_LB_EXPORT_DUMPDIR" ]; then
+  GLITE_LB_EXPORT_DUMPDIR=/tmp/dump
+  echo "GLITE_LB_EXPORT_DUMPDIR not specified (-D arguent of the bkserver), used $GLITE_LB_EXPORT_DUMPDIR"
+fi
+# LB maildir for job registration
+if [ -z "$GLITE_LB_EXPORT_JPREG_MAILDIR" ]; then
+  GLITE_LB_EXPORT_JPREG_MAILDIR=/tmp/jpreg
+  echo "GLITE_LB_EXPORT_JPREG_MAILDIR not specified (-J arguent of the bkserver), used $GLITE_LB_EXPORT_JPREG_MAILDIR"
+fi
 
 CERT_ARGS="-c $X509_USER_CERT -k $X509_USER_KEY"
-LB_DUMPDIR=/tmp/lb_server_dump
-BKSERVER_DUMPDIR_OLD=/tmp/dump.old
-LB_EXPORTDIR=/tmp/lb_export
-PREFIX=`dirname $0`/..
-LOGDIR=/tmp/log
+GLITE_LB_EXPORT_JPDUMP_MAILDIR=${GLITE_LB_EXPORT_JPDUMP_MAILDIR:-/tmp/jpdump}
+GLITE_LB_EXPORT_DUMPDIR_OLD=${GLITE_LB_EXPORT_DUMPDIR_OLD:-$GLITE_LB_EXPORT_DUMPDIR.old}
+GLITE_LB_EXPORT_EXPORTDIR=${GLITE_LB_EXPORT_EXPORTDIR:-/tmp/lbexport}
+PREFIX=${PREFIX:-`dirname $0`/..}
+LOGDIR=$GLITE_LOCATION_VAR
+GLITE_LB_EXPORT_PURGE_ARGS=${GLITE_LB_EXPORT_PURGE_ARGS:--a 1h -c 1h -n 1h -o 1d}
 
 
-[ -d $LB_DUMPDIR ] || mkdir -p $LB_DUMPDIR
-[ -d $BKSERVER_DUMPDIR ] || mkdir -p $BKSERVER_DUMPDIR
-[ -d $BKSERVER_DUMPDIR_OLD ] || mkdir -p $BKSERVER_DUMPDIR_OLD
-[ -d $LB_EXPORTDIR ] || mkdir -p $LB_EXPORTDIR
+[ -d $GLITE_LB_EXPORT_JPDUMP_MAILDIR ] || mkdir -p $GLITE_LB_EXPORT_JPDUMP_MAILDIR
+[ -d $GLITE_LB_EXPORT_DUMPDIR ] || mkdir -p $GLITE_LB_EXPORT_DUMPDIR
+[ -d $GLITE_LB_EXPORT_DUMPDIR_OLD ] || mkdir -p $GLITE_LB_EXPORT_DUMPDIR_OLD
+[ -d $GLITE_LB_EXPORT_EXPORTDIR ] || mkdir -p $GLITE_LB_EXPORT_EXPORTDIR
 [ -d $LOGDIR ] || mkdir -p $LOGDIR
 
 echo "Using cert args $CERT_ARGS"
 
-$PREFIX/bin/glite-jp-importer -r $BKSERVER_JOBREG_MAILDIR -d $LB_DUMPDIR $CERT_ARGS -g -p $JBSERVER > $LOGDIR/jp-importer.log 2>&1 &
+$PREFIX/bin/glite-jp-importer -r $GLITE_LB_EXPORT_JPREG_MAILDIR -d $GLITE_LB_EXPORT_JPDUMP_MAILDIR $CERT_ARGS -g -p $GLITE_LB_EXPORT_JPPS > $LOGDIR/jp-importer.log 2>&1 &
 JP_PID=$!
 trap "kill $JP_PID; exit 0" SIGINT
 
 while [ 1 ]; do
-  $PREFIX/sbin/glite-lb-purge -o 1 -l -m $BKSERVER
+  $PREFIX/sbin/glite-lb-purge $GLITE_LB_EXPORT_PURGE_ARGS -l -m $GLITE_LB_EXPORT_BKSERVER
 
-  for file in $BKSERVER_DUMPDIR/*; do
-    rm -f $LB_EXPORTDIR/*
+  for file in $GLITE_LB_EXPORT_DUMPDIR/*; do
     if [ -s $file ]; then
-      $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $LB_EXPORTDIR -m $LB_DUMPDIR
-      mv $file $BKSERVER_DUMPDIR_OLD
+      $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $GLITE_LB_EXPORT_EXPORTDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR
+      mv $file $GLITE_LB_EXPORT_DUMPDIR_OLD
     else
       rm $file
     fi