Fix requirements, use GLITE_HOME_DIR instead of GLITE_USER_HOME.

diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb
index deb35f7..64b7940 100644 (file)
--- a/org.glite.yaim.lb/config/functions/config_glite_lb
+++ b/org.glite.yaim.lb/config/functions/config_glite_lb
@@ -1,13 +1,13 @@
 function config_glite_lb_check(){
-  requires MYSQL_PASSWORD
+  requires $1 MYSQL_PASSWORD INSTALL_ROOT GLITE_LOCATION GLITE_LOCATION_VAR GLITE_USER GLITE_HOME_DIR
 }
 
 function config_glite_lb_setenv(){
 
   yaimgridenv_set GLITE_JP_LOCATION ${GLITE_JP_LOCATION:-}
-  yaimgridenv_set GLITE_WMS_QUERY_TIMEOUT 300
-  yaimgridenv_set GLITE_HOST_CERT ${GLITE_USER_HOME:-/home/glite}/.certs/hostcert.pem
-  yaimgridenv_set GLITE_HOST_KEY ${GLITE_USER_HOME:-/home/glite}/.certs/hostkey.pem
+  yaimgridenv_set GLITE_WMS_QUERY_TIMEOUT ${GLITE_WMS_QUERY_TIMEOUT:-300}
+  yaimgridenv_set GLITE_HOST_CERT ${GLITE_HOME_DIR:-/home/glite}/.certs/hostcert.pem
+  yaimgridenv_set GLITE_HOST_KEY ${GLITE_HOME_DIR:-/home/glite}/.certs/hostkey.pem
   yaimgridenv_set X509_CERT_DIR /etc/grid-security/certificates
   yaimgridenv_set X509_VOMS_DIR /etc/grid-security/vomsdir
 
@@ -94,24 +94,23 @@ function config_glite_lb() {
 
   # do we need bkindex?
 
-  GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-/var/glite}
   mkdir -p $GLITE_LOCATION_VAR   # Needed to store PID of LB server 
 
   chown $GLITE_USER:$GLITE_USER $GLITE_LOCATION_VAR
   chmod 0755 $GLITE_LOCATION_VAR
 
-  mkdir -p $GLITE_USER_HOME/.certs
-  chown $GLITE_USER:$GLITE_USER $GLITE_USER_HOME/.certs
-  chmod 0755 $GLITE_USER_HOME/.certs
-  cp -f /etc/grid-security/hostcert.pem /etc/grid-security/hostkey.pem $GLITE_USER_HOME/.certs/
+  mkdir -p $GLITE_HOME_DIR/.certs
+  chown $GLITE_USER:$GLITE_USER $GLITE_HOME_DIR/.certs
+  chmod 0755 $GLITE_HOME_DIR/.certs
+  cp -f /etc/grid-security/hostcert.pem /etc/grid-security/hostkey.pem $GLITE_HOME_DIR/.certs/
   if [ ! $? = 0 ] ; then
     echo "Please copy host certificate and key into /etc/grid-security and"
-    echo "  $GLITE_USER_HOME/.certs/, change the owner of the ones in"
-    echo "  $GLITE_USER_HOME/.certs/ to $GLITE_USER"
+    echo "  $GLITE_HOME_DIR/.certs/, change the owner of the ones in"
+    echo "  $GLITE_HOME_DIR/.certs/ to $GLITE_USER"
   fi
-  chown $GLITE_USER:$GLITE_USER $GLITE_USER_HOME/.certs/hostcert.pem $GLITE_USER_HOME/.certs/hostkey.pem
-  chmod 0644 $GLITE_USER_HOME/.certs/hostcert.pem
-  chmod 0400 $GLITE_USER_HOME/.certs/hostkey.pem
+  chown $GLITE_USER:$GLITE_USER $GLITE_HOME_DIR/.certs/hostcert.pem $GLITE_HOME_DIR/.certs/hostkey.pem
+  chmod 0644 $GLITE_HOME_DIR/.certs/hostcert.pem
+  chmod 0400 $GLITE_HOME_DIR/.certs/hostkey.pem
 
   # Create cron for purging
   mkdir -p /var/log/glite