From: Zdeněk Salvet <salvet@ics.muni.cz>
Date: Tue, 17 Feb 2009 11:53:59 +0000 (+0000)
Subject: Prune variables that should be set by YAIM core, force GLITE_LOCATION_VAR
X-Git-Tag: glite-yaim-lb_R_4_1_0_1~14
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=6856d859965631b5d647f40f08570893f1427ff6;p=jra1mw.git

Prune variables that should be set by YAIM core, force GLITE_LOCATION_VAR
to /var/glite for backward compatibility.
---

diff --git a/org.glite.yaim.lb/config/defaults/glite-lb.pre b/org.glite.yaim.lb/config/defaults/glite-lb.pre
index 4b697ab..7b9c535 100644
--- a/org.glite.yaim.lb/config/defaults/glite-lb.pre
+++ b/org.glite.yaim.lb/config/defaults/glite-lb.pre
@@ -1,3 +1,3 @@
 ### Default values to some glite-LB variables
-GLITE_USER=glite
 GLITE_WMS_LCGMON_FILE="/var/glite/logging/status.log"
+GLITE_LOCATION_VAR=/var/glite
diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb
index 8749485..deb35f7 100644
--- a/org.glite.yaim.lb/config/functions/config_glite_lb
+++ b/org.glite.yaim.lb/config/functions/config_glite_lb
@@ -4,10 +4,7 @@ function config_glite_lb_check(){
 
 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
   yaimgridenv_set GLITE_HOST_KEY ${GLITE_USER_HOME:-/home/glite}/.certs/hostkey.pem