From a8cb25db9b113a455c0303d4e15039d30da4920d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 15 Jan 2013 17:18:58 +0000 Subject: [PATCH] Enable server and proxy purge only on proper L&B service type (SB #99276). --- org.glite.lb.client/src/export.sh | 10 ++++++++++ org.glite.lb.server/config/glite-lb-proxy-purge.cron | 2 +- org.glite.lb.server/config/glite-lb-server-purge.cron | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/org.glite.lb.client/src/export.sh b/org.glite.lb.client/src/export.sh index 103247e..10c8080 100644 --- a/org.glite.lb.client/src/export.sh +++ b/org.glite.lb.client/src/export.sh @@ -25,6 +25,16 @@ #autodetect the prefix PREFIX=${GLITE_LOCATION:-`dirname $0`/..} +PURGE_TYPE=${1:-server} + +if [ "$GLITE_LB_TYPE" != "both" -a "$PURGE_TYPE" != "$GLITE_LB_TYPE" ]; then + echo "No $PURGE_TYPE purge on L&B $GLITE_LB_TYPE" + exit 0 +fi + +if [ "$PURGE_TYPE" = "proxy" ]; then + GLITE_LB_PURGE_OTHER_OPTIONS="$GLITE_LB_PURGE_OTHER_OPTIONS -x" +fi if [ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] ;then creds="-c '$GLITE_HOST_CERT' -k '$GLITE_HOST_KEY'" diff --git a/org.glite.lb.server/config/glite-lb-proxy-purge.cron b/org.glite.lb.server/config/glite-lb-proxy-purge.cron index 85037f5..59f9869 100644 --- a/org.glite.lb.server/config/glite-lb-proxy-purge.cron +++ b/org.glite.lb.server/config/glite-lb-proxy-purge.cron @@ -1 +1 @@ -31 1 * * * glite ( test -f /etc/profile.d/grid-env.sh || exit 0; . /etc/profile.d/grid-env.sh; export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; export GLITE_LB_PURGE_OTHER_OPTIONS="$GLITE_LB_PURGE_OTHER_OPTIONS -x"; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export.sh: "; @glite_prefix@/sbin/glite-lb-export.sh ) >> /var/log/glite/glite-lb-server-purge-proxy.log 2>&1 +31 1 * * * glite ( test -f /etc/profile.d/grid-env.sh || exit 0; . /etc/profile.d/grid-env.sh; export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export.sh: "; @glite_prefix@/sbin/glite-lb-export.sh proxy ) >> /var/log/glite/glite-lb-server-purge-proxy.log 2>&1 diff --git a/org.glite.lb.server/config/glite-lb-server-purge.cron b/org.glite.lb.server/config/glite-lb-server-purge.cron index c946995..c6ea1b3 100644 --- a/org.glite.lb.server/config/glite-lb-server-purge.cron +++ b/org.glite.lb.server/config/glite-lb-server-purge.cron @@ -1 +1 @@ -1 1 * * * glite ( test -f /etc/profile.d/grid-env.sh || exit 0; . /etc/profile.d/grid-env.sh; export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export.sh: "; @glite_prefix@/sbin/glite-lb-export.sh ) >> /var/log/glite/glite-lb-server-purge.log 2>&1 +1 1 * * * glite ( test -f /etc/profile.d/grid-env.sh || exit 0; . /etc/profile.d/grid-env.sh; export GLITE_LB_EXPORT_BKSERVER=`hostname -f`; export GLITE_LB_PURGE_TARGET_RUNTIME=84600s; printf "`date "+\%b \%e \%T"` `hostname -s` glite-lb-export.sh: "; @glite_prefix@/sbin/glite-lb-export.sh server ) >> /var/log/glite/glite-lb-server-purge.log 2>&1 -- 1.8.2.3