- allow GLITE_* defaults to be overridden by environment (req. by A.Gianelle)

- source $GLITE_LOCATION/etc/glite-wms.conf
- source $HOME/.glite.conf last
- protect "creds" and "port" internal variables

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index dd90481..055c890 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -1,15 +1,19 @@
 #!/bin/sh
 
-GLITE_LOCATION=/opt/glite
-GLITE_USER=glite
-GLITE_LOCATION_VAR=/opt/glite/var
+GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
+GLITE_USER=${GLITE_USER:-glite}
+GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-$GLITE_LOCATION/var}
 
 [ -f /etc/glite.conf ] && . /etc/glite.conf
-[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
+[ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
 
 [ -f $GLITE_LOCATION/etc/lb.conf ] && . $GLITE_LOCATION/etc/lb.conf
 [ -f $GLITE_LOCATION_VAR/etc/lb.conf ] && . $GLITE_LOCATION_VAR/etc/lb.conf
 
+[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
+
+unset creds port
+
 start()
 {
        [ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] &&

diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties
index c96da58..810d291 100644 (file)
--- a/org.glite.lb.logger/project/version.properties
+++ b/org.glite.lb.logger/project/version.properties
@@ -1,4 +1,4 @@
 #Mon Oct 18 14:16:38 CEST 2004
-module.version=0.2.0
+module.version=0.2.1
 module.build=47
 module.age=0

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 3acda57..1b74a0f 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -1,18 +1,22 @@
 #!/bin/sh
 
-GLITE_LOCATION=/opt/glite
-GLITE_USER=glite
-GLITE_LOCATION_VAR=/opt/glite/var
+GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
+GLITE_USER=${GLITE_USER:-glite}
+GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
 
 [ -f /etc/glite.conf ] && . /etc/glite.conf
-[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
+[ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
 
 [ -f $GLITE_LOCATION/etc/lb.conf ] && . $GLITE_LOCATION/etc/lb.conf
 [ -f $GLITE_LOCATION_VAR/etc/lb.conf ] && . $GLITE_LOCATION_VAR/etc/lb.conf
 
+[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
+
 [ -n "$GLITE_LB_SERVER_PIDFILE" ] && pidfile=$GLITE_LB_SERVER_PIDFILE ||
        pidfile=$GLITE_LOCATION_VAR/glite-lb-bkserverd.pid
 
+unset creds port
+
 start()
 {
        [ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] &&

diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties
index f3dbe68..3c4f2d5 100644 (file)
--- a/org.glite.lb.server/project/version.properties
+++ b/org.glite.lb.server/project/version.properties
@@ -1,4 +1,4 @@
 #Mon Oct 18 14:15:21 CEST 2004
-module.version=0.3.1
+module.version=0.3.2
 module.build=46
 module.age=0