From 058fd5bd1b4f7284a36555a25fdd4ec3855ca22b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 21 Dec 2012 15:39:48 +0000 Subject: [PATCH] Update dump and purge locations too, updates for L&B mill (currently unused). --- org.glite.lb.harvester/config/startup | 1 - org.glite.lb.logger/config/startup | 1 - org.glite.lb.server/config/glite-lb | 1 - org.glite.lb.server/config/startup | 22 ++++++++-------------- org.glite.lb.server/src/export.sh.in | 9 ++++----- org.glite.lb.yaim/Makefile | 8 ++------ org.glite.lb.yaim/config/defaults/glite-lb.pre | 1 - .../config/functions/config_glite_lb.in | 1 - 8 files changed, 14 insertions(+), 30 deletions(-) diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup index ce64e06..7dfa27b 100755 --- a/org.glite.lb.harvester/config/startup +++ b/org.glite.lb.harvester/config/startup @@ -28,7 +28,6 @@ GLITE_LOCATION=${GLITE_LOCATION:-'@glite_prefix@'} GLITE_LOCATION_ETC=${GLITE_LOCATION_ETC:-'@glite_etc@'} -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} GLITE_USER=${GLITE_USER:-'glite'} GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6` GLITE_HOST_CERT=${GLITE_HOST_CERT:-"$GLITE_HOME/.certs/hostcert.pem"} diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup index 1473d35..cdc4db0 100755 --- a/org.glite.lb.logger/config/startup +++ b/org.glite.lb.logger/config/startup @@ -28,7 +28,6 @@ GLITE_LOCATION=${GLITE_LOCATION:-'@glite_prefix@'} GLITE_LOCATION_ETC=${GLITE_LOCATION_ETC:-'@glite_etc@'} -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} GLITE_USER=${GLITE_USER:-'glite'} GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6` GLITE_HOST_CERT=${GLITE_HOST_CERT:-"$GLITE_HOME/.certs/hostcert.pem"} diff --git a/org.glite.lb.server/config/glite-lb b/org.glite.lb.server/config/glite-lb index bfa912a..5304382 100644 --- a/org.glite.lb.server/config/glite-lb +++ b/org.glite.lb.server/config/glite-lb @@ -10,7 +10,6 @@ #GLITE_LOCATION=@glite_prefix@ #GLITE_LOCATION_ETC='@glite_etc@' -#GLITE_LB_LOCATION_VAR='@glite_var@' # query timeout GLITE_WMS_QUERY_TIMEOUT=300 diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup index a7b7cb9..36ee8d9 100755 --- a/org.glite.lb.server/config/startup +++ b/org.glite.lb.server/config/startup @@ -27,7 +27,6 @@ # GLITE_LOCATION=${GLITE_LOCATION:-'@glite_prefix@'} -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} GLITE_LOCATION_ETC=${GLITE_LOCATION_ETC:-'@glite_etc@'} GLITE_JP_LOCATION=${GLITE_JP_LOCATION:-$GLITE_LOCATION} GLITE_USER=${GLITE_USER:-'glite'} @@ -48,7 +47,7 @@ LOG4C_RCPATH="$GLITE_LOCATION_ETC/glite-lb" [ -n "$GLITE_LB_SERVER_PIDFILE" ] && BK_PIDFILE=$GLITE_LB_SERVER_PIDFILE || BK_PIDFILE=/var/run/glite/glite-lb-bkserverd.pid [ -n "$GLITE_JP_IMPORTER_PIDFILE" ] && jp_importer_pidfile=$GLITE_JP_IMPORTER_PIDFILE || - jp_importer_pidfile=$GLITE_LB_LOCATION_VAR/glite-jp-importer.pid + jp_importer_pidfile=/var/run/glite/glite-jp-importer.pid GLITE_LB_TYPE=${GLITE_LB_TYPE:-'server'} # server, proxy, both GLITE_LB_NOTIF_SOCK=${GLITE_LB_NOTIF_SOCK:-'/var/run/glite/glite-lb-notif.sock'} @@ -185,11 +184,11 @@ start() unset lcas_log fi - [ -z "$GLITE_LB_EXPORT_DUMPDIR" ] && GLITE_LB_EXPORT_DUMPDIR=$GLITE_LB_LOCATION_VAR/dump + [ -z "$GLITE_LB_EXPORT_DUMPDIR" ] && GLITE_LB_EXPORT_DUMPDIR=$GLITE_HOME/dump dumpdir="--dump-prefix $GLITE_LB_EXPORT_DUMPDIR" [ -d "$GLITE_LB_EXPORT_DUMPDIR" ] || mkdir -p "$GLITE_LB_EXPORT_DUMPDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_DUMPDIR" - [ -z "$GLITE_LB_EXPORT_PURGEDIR" ] && GLITE_LB_EXPORT_PURGEDIR=$GLITE_LB_LOCATION_VAR/purge + [ -z "$GLITE_LB_EXPORT_PURGEDIR" ] && GLITE_LB_EXPORT_PURGEDIR=$GLITE_HOME/purge purgedir="--purge-prefix $GLITE_LB_EXPORT_PURGEDIR" [ -d "$GLITE_LB_EXPORT_PURGEDIR" ] || mkdir -p "$GLITE_LB_EXPORT_PURGEDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_PURGEDIR" @@ -200,18 +199,18 @@ start() fi # registrations - [ -z "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] && GLITE_LB_EXPORT_JPREG_MAILDIR=$GLITE_LB_LOCATION_VAR/jpreg + [ -z "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] && GLITE_LB_EXPORT_JPREG_MAILDIR=/var/spool/glite/jpreg jpreg_maildir="--reg-mdir $GLITE_LB_EXPORT_JPREG_MAILDIR" lbreg_maildir="--jpreg-dir $GLITE_LB_EXPORT_JPREG_MAILDIR" [ -d "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] || mkdir -p "$GLITE_LB_EXPORT_JPREG_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_JPREG_MAILDIR" # dumps - [ -z "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" ] && GLITE_LB_EXPORT_JPDUMP_MAILDIR=$GLITE_LB_LOCATION_VAR/jpdump + [ -z "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" ] && GLITE_LB_EXPORT_JPDUMP_MAILDIR=/var/spool/glite/jpdump jpdump_maildir="--dump-mdir $GLITE_LB_EXPORT_JPDUMP_MAILDIR" [ -d "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" ] || mkdir -p "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_JPDUMP_MAILDIR" # sandboxes - [ -z "$GLITE_LB_EXPORT_SANDBOX_MAILDIR" ] && GLITE_LB_EXPORT_SANDBOX_MAILDIR=$GLITE_LB_LOCATION_VAR/sandbox + [ -z "$GLITE_LB_EXPORT_SANDBOX_MAILDIR" ] && GLITE_LB_EXPORT_SANDBOX_MAILDIR=/var/spool/glite/sandbox sandbox_maildir="--sandbox-mdir $GLITE_LB_EXPORT_SANDBOX_MAILDIR" [ -d "$GLITE_LB_EXPORT_SANDBOX_MAILDIR" ] || mkdir -p "$GLITE_LB_EXPORT_SANDBOX_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_SANDBOX_MAILDIR" @@ -230,13 +229,8 @@ start() notifargs="$notifargs -f $GLITE_LB_NOTIF_FPREFIX" fi if [ -n "$GLITE_LB_SERVER_DEBUG" ] ; then - if which tscat >/dev/null; then - GLITE_LB_SERVER_OTHER_OPTIONS="$GLITE_LB_SERVER_OTHER_OPTIONS -d -s 1 2>&1 | tscat >> $GLITE_LB_LOCATION_VAR/lb.log &" - GLITE_LB_NOTIF_OTHER_OPTIONS="$GLITE_LB_NOTIF_OTHER_OPTIONS -v -d 2>&1 | tscat >> $GLITE_LB_LOCATION_VAR/notif-il.log &" - else - GLITE_LB_SERVER_OTHER_OPTIONS="$GLITE_LB_SERVER_OTHER_OPTIONS -d -s 1 >> $GLITE_LB_LOCATION_VAR/lb.log 2>&1 &" - GLITE_LB_NOTIF_OTHER_OPTIONS="$GLITE_LB_NOTIF_OTHER_OPTIONS -v -d >> $GLITE_LB_LOCATION_VAR/notif-il.log 2>&1 &" - fi + GLITE_LB_SERVER_OTHER_OPTIONS="$GLITE_LB_SERVER_OTHER_OPTIONS -d -s 1 >> $GLITE_HOME/lb.log 2>&1 &" + GLITE_LB_NOTIF_OTHER_OPTIONS="$GLITE_LB_NOTIF_OTHER_OPTIONS -v -d >> $GLITE_HOME/notif-il.log 2>&1 &" fi if [ -n "$GLITE_LB_PROXY_SOCK" ]; then bkproxy="--proxy-il-sock $GLITE_LB_PROXY_SOCK" diff --git a/org.glite.lb.server/src/export.sh.in b/org.glite.lb.server/src/export.sh.in index 8f18315..13bb563 100644 --- a/org.glite.lb.server/src/export.sh.in +++ b/org.glite.lb.server/src/export.sh.in @@ -21,7 +21,6 @@ # jobs export and import into Job Provenance may be optionally enabled # -GLITE_LB_LOCATION_VAR=${GLITE_LB_LOCATION_VAR:-'@glite_var@'} GLITE_USER=${GLITE_USER:-'glite'} GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6` GLITE_HOST_CERT=${GLITE_HOST_CERT:-"$GLITE_HOME/.certs/hostcert.pem"} @@ -53,14 +52,14 @@ fi # dump directory of bkserver -GLITE_LB_EXPORT_PURGEDIR=${GLITE_LB_EXPORT_PURGEDIR:-$GLITE_LB_LOCATION_VAR/purge} -GLITE_LB_EXPORT_DUMPDIR=${GLITE_LB_EXPORT_DUMPDIR:-$GLITE_LB_LOCATION_VAR/dump} +GLITE_LB_EXPORT_PURGEDIR=${GLITE_LB_EXPORT_PURGEDIR:-$GLITE_HOME/purge} +GLITE_LB_EXPORT_DUMPDIR=${GLITE_LB_EXPORT_DUMPDIR:-$GLITE_HOME/dump} GLITE_LB_EXPORT_PURGEDIR_KEEP=${GLITE_LB_EXPORT_PURGEDIR_KEEP:-""} GLITE_LB_EXPORT_DUMPDIR_KEEP=${GLITE_LB_EXPORT_DUMPDIR_KEEP:-""} # maildir dump directory for jp importer -GLITE_LB_EXPORT_JPDUMP_MAILDIR=${GLITE_LB_EXPORT_JPDUMP_MAILDIR:-$GLITE_LB_LOCATION_VAR/jpdump} +GLITE_LB_EXPORT_JPDUMP_MAILDIR=${GLITE_LB_EXPORT_JPDUMP_MAILDIR:-/var/spool/glite/jpdump} # directory with exported data (file per job) -GLITE_LB_EXPORT_JOBSDIR=${GLITE_LB_EXPORT_JOBSDIR:-$GLITE_LB_LOCATION_VAR/lbexport} +GLITE_LB_EXPORT_JOBSDIR=${GLITE_LB_EXPORT_JOBSDIR:-/var/spool/glite/lbexport} # purge args (timeouts) GLITE_LB_EXPORT_PURGE_ARGS=${GLITE_LB_EXPORT_PURGE_ARGS:---cleared 2d --aborted 15d --cancelled 15d --other 60d} # Book Keeping Server diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile index fc8bb5b..707ff8b 100644 --- a/org.glite.lb.yaim/Makefile +++ b/org.glite.lb.yaim/Makefile @@ -31,12 +31,8 @@ sysdefaultdir=${sysconfdir}/sysconfig endif all ${FILES}: - glite_var="${localstatedir}/glite"; \ - if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ - glite_var="${localstatedir}"; \ - fi; \ - sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' -e "s:@glite_var@:$$glite_var:g" $(top_srcdir)/config/defaults/glite-lb.pre > glite-lb.pre; \ - sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' -e "s:@glite_var@:$$glite_var:g" -e 's:@defaultdir@:${sysdefaultdir}:g' $(top_srcdir)/config/functions/config_glite_lb.in > config_glite_lb + sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' $(top_srcdir)/config/defaults/glite-lb.pre > glite-lb.pre; \ + sed -e 's:@glite_prefix@:${sysroot}${prefix}:g' -e 's:@glite_etc@:${sysconfdir}:g' -e 's:@defaultdir@:${sysdefaultdir}:g' $(top_srcdir)/config/functions/config_glite_lb.in > config_glite_lb # metapackage info echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > COPYRIGHT diff --git a/org.glite.lb.yaim/config/defaults/glite-lb.pre b/org.glite.lb.yaim/config/defaults/glite-lb.pre index a3ba409..a0206c4 100644 --- a/org.glite.lb.yaim/config/defaults/glite-lb.pre +++ b/org.glite.lb.yaim/config/defaults/glite-lb.pre @@ -6,7 +6,6 @@ #GLITE_LB_LOCATION='@glite_prefix@' #GLITE_LB_LOCATION_ETC='@glite_etc@' -#GLITE_LB_LOCATION_VAR='@glite_var@' # query timeout #GLITE_WMS_QUERY_TIMEOUT=300 diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb.in b/org.glite.lb.yaim/config/functions/config_glite_lb.in index fd8755c..07864a0 100644 --- a/org.glite.lb.yaim/config/functions/config_glite_lb.in +++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in @@ -41,7 +41,6 @@ function config_glite_lb_setenv(){ yaimgridenv_set GLITE_LOCATION "${GLITE_LOCATION:-@glite_prefix@}" yaimgridenv_set GLITE_LOCATION_ETC "${GLITE_LOCATION_ETC:-@glite_etc@}" - yaimgridenv_set GLITE_LB_LOCATION_VAR "${GLITE_LB_LOCATION_VAR:-@glite_var@}" yaimgridenv_set GLITE_JP_LOCATION "${GLITE_JP_LOCATION:-}" yaimgridenv_set GLITE_LB_NOTIF_SOCK "${GLITE_LB_NOTIF_SOCK:-}" -- 1.8.2.3