L&B proxy support in startup scripts. GLITE_LB_TYPE values: server (default), proxy...

diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb
index 54ed16e..31f50e7 100644 (file)
--- a/org.glite.yaim.lb/config/functions/config_glite_lb
+++ b/org.glite.yaim.lb/config/functions/config_glite_lb
@@ -19,6 +19,8 @@ function config_glite_lb_setenv(){
   yaimgridenv_set GLITE_LB_RTM_DN ${GLITE_LB_RTM_DN:-/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk}
   yaimgridenv_set GLITE_LB_SUPER_USERS ${GLITE_LB_SUPER_USERS:-}
 
+  yaimgridenv_set GLITE_LB_TYPE ${GLITE_LB_TYPE:-server}
+
   cares_prefix=${INSTALL_ROOT:-/opt}/c-ares
   classads_prefix=${INSTALL_ROOT:-/opt}/classads
   if [ x`uname -m` = xx8664 ]; then
@@ -180,11 +182,15 @@ EOF
 
   . /opt/glite/etc/profile.d/grid-env.sh
   ${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd stop
-  #Temporary workaround to kill glite-lb-notif-interlogd
+  #Temporary workaround to kill glite-lb-*-interlogd
   ps ax | grep -v grep | grep glite-lb-notif-interlogd > /dev/null
   if [ $? = 0 ]; then
     killall -9 /opt/glite/bin/glite-lb-notif-interlogd
   fi  
+  ps ax | grep -v grep | grep glite-lb-interlogd > /dev/null
+  if [ $? = 0 ]; then
+    killall -9 /opt/glite/bin/glite-lb-interlogd
+  fi  
   ${GLITE_LOCATION}/etc/init.d/glite-lb-bkserverd start
 
   if [ ! $? = 0 ] ; then