From 8bd24e245667e23a15941c01143e08cb9fd48f13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 8 Jan 2009 20:55:19 +0000 Subject: [PATCH] Fixes: found classad library, better checking for existing database. JP relocation feature. --- org.glite.yaim.lb/config/functions/config_glite_lb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb index 73b8013..9f89b58 100644 --- a/org.glite.yaim.lb/config/functions/config_glite_lb +++ b/org.glite.yaim.lb/config/functions/config_glite_lb @@ -6,6 +6,7 @@ function config_glite_lb_setenv(){ yaimgridenv_set GLITE_LOCATION ${INSTALL_ROOT:-opt}/glite yaimgridenv_set GLITE_LOCATION_VAR ${GLITE_LOCATION_VAR:-/var/glite} + yaimgridenv_set GLITE_JP_LOCATION ${GLITE_JP_LOCATION:-} yaimgridenv_set GLITE_USER ${GLITE_USER:-glite} yaimgridenv_set GLITE_WMS_QUERY_TIMEOUT 300 yaimgridenv_set GLITE_HOST_CERT ${GLITE_USER_HOME:-/home/glite}/.certs/hostcert.pem @@ -17,9 +18,10 @@ function config_glite_lb_setenv(){ yaimgridenv_set GLITE_LB_EXPORT_PURGE_ARGS "${GLITE_LB_EXPORT_PURGE_ARGS:---cleared 2d --aborted 15d --cancelled 15d --other 60d}" yaimgridenv_set GLITE_LB_EXPORT_JPPS ${GLITE_LB_EXPORT_JPPS:-} - yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/glite/lib - yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/globus/lib + yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/glite/lib + yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/globus/lib yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/c-ares/lib + yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/classads/lib } function config_glite_lb() { @@ -68,7 +70,7 @@ function config_glite_lb() { set_mysql_passwd || return 1 # the function uses $MYSQL_PASSWORD # Check if database exist - mysqlshow --password="$MYSQL_PASSWORD" | grep "lbserver20" > /dev/null 2>&1 + mysqlshow --password="$MYSQL_PASSWORD" | grep "\" > /dev/null 2>&1 if [ ! $? = 0 ]; then mysql -u root --password="$MYSQL_PASSWORD" -e "CREATE DATABASE lbserver20" -- 1.8.2.3