Upgrade with new startup scripts, let harvester disabled on Debian by default.

diff --git a/org.glite.lb.logger/config/startup.debian.interlogd b/org.glite.lb.logger/config/startup.debian.interlogd
index 972b4e8..7ecde98 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.interlogd
+++ b/org.glite.lb.logger/config/startup.debian.interlogd
@@ -79,6 +79,9 @@ do_stop()
        return "$RETVAL"
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-interlogd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-interlogd.pid /var/run/glite
+
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.debian.logd b/org.glite.lb.logger/config/startup.debian.logd
index 8114a6e..e7917fa 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.logd
+++ b/org.glite.lb.logger/config/startup.debian.logd
@@ -76,6 +76,9 @@ do_stop()
        return "$RETVAL"
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-logd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-logd.pid /var/run/glite
+
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.debian.notif-interlogd b/org.glite.lb.logger/config/startup.debian.notif-interlogd
index f81620a..4337616 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.notif-interlogd
+++ b/org.glite.lb.logger/config/startup.debian.notif-interlogd
@@ -76,6 +76,9 @@ do_stop()
        return "$RETVAL"
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-notif-interlogd.pid /var/run/glite
+
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.debian.proxy-interlogd b/org.glite.lb.logger/config/startup.debian.proxy-interlogd
index 14700fe..6d81e1b 100755 (executable)
--- a/org.glite.lb.logger/config/startup.debian.proxy-interlogd
+++ b/org.glite.lb.logger/config/startup.debian.proxy-interlogd
@@ -76,6 +76,9 @@ do_stop()
        return "$RETVAL"
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite
+
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.logger/config/startup.redhat.interlogd b/org.glite.lb.logger/config/startup.redhat.interlogd
index a0b30f1..e0dd46a 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.interlogd
+++ b/org.glite.lb.logger/config/startup.redhat.interlogd
@@ -72,6 +72,9 @@ stop() {
        return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-interlogd.pid -a ! -f /var/run/glite/glite-lb-interlogd.pid ] && mv -v /var/glite/glite-lb-interlogd.pid /var/run/glite
+
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/config/startup.redhat.logd b/org.glite.lb.logger/config/startup.redhat.logd
index ccb43e7..d00eda0 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.logd
+++ b/org.glite.lb.logger/config/startup.redhat.logd
@@ -72,6 +72,9 @@ stop() {
        return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-logd.pid -a ! -f /var/run/glite/glite-lb-logd.pid ] && mv -v /var/glite/glite-lb-logd.pid /var/run/glite
+
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/config/startup.redhat.notif-interlogd b/org.glite.lb.logger/config/startup.redhat.notif-interlogd
index f09c53f..2f6dd3f 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.notif-interlogd
+++ b/org.glite.lb.logger/config/startup.redhat.notif-interlogd
@@ -72,6 +72,9 @@ stop() {
        return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f /var/run/glite/glite-lb-notif-interlogd.pid ] && mv -v /var/glite/glite-lb-notif-interlogd.pid /var/run/glite
+
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.logger/config/startup.redhat.proxy-interlogd b/org.glite.lb.logger/config/startup.redhat.proxy-interlogd
index bdb13db..41103df 100755 (executable)
--- a/org.glite.lb.logger/config/startup.redhat.proxy-interlogd
+++ b/org.glite.lb.logger/config/startup.redhat.proxy-interlogd
@@ -72,6 +72,9 @@ stop() {
        return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f /var/run/glite/glite-lb-proxy-interlogd.pid ] && mv -v /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite
+
 case "$1" in
     start)
        status $prog >/dev/null 2>&1 && exit 0

diff --git a/org.glite.lb.server/config/glite-lb b/org.glite.lb.server/config/glite-lb
index 7629158..ef2ac3a 100644 (file)
--- a/org.glite.lb.server/config/glite-lb
+++ b/org.glite.lb.server/config/glite-lb
@@ -102,3 +102,4 @@ GLITE_LB_RTM_DN='/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.
 @debian@RUN_PROXY_IL=no
 @debian@RUN_NOTIF_IL=no
 @debian@RUN_LOGD=no
+@debian@RUN_HARVESTER=no

diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index 4f1517a..7347d02 100755 (executable)
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -845,6 +845,7 @@ if test "$setup_startup" = "1" -a "$startup_error" != "1"; then
 @debian@               $GLITE_LOCATION_ETC/init.d/glite-lb-$i restart || startup_error=1
 @debian@       done
 @redhat@       /sbin/chkconfig mysqld on
+@redhat@       /sbin/chkconfig glite-lb-locallogger off >/dev/null 2>&1 || :
 @redhat@       /sbin/chkconfig glite-lb-bkserverd on
 @redhat@       /sbin/chkconfig glite-lb-logd on
 @redhat@       /sbin/chkconfig glite-lb-interlogd on

diff --git a/org.glite.lb.server/config/startup.debian.bkserverd b/org.glite.lb.server/config/startup.debian.bkserverd
index 7b4f4ca..aaf96a2 100755 (executable)
--- a/org.glite.lb.server/config/startup.debian.bkserverd
+++ b/org.glite.lb.server/config/startup.debian.bkserverd
@@ -93,6 +93,9 @@ do_stop()
        return "$RETVAL"
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-bkserverd.pid -a ! -f $PIDFILE ] && mv -v /var/glite/glite-lb-bkserverd.pid /var/run/glite
+
 case "$1" in
   start)
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"

diff --git a/org.glite.lb.server/config/startup.redhat.bkserverd b/org.glite.lb.server/config/startup.redhat.bkserverd
index 03a76a4..e9a55f5 100755 (executable)
--- a/org.glite.lb.server/config/startup.redhat.bkserverd
+++ b/org.glite.lb.server/config/startup.redhat.bkserverd
@@ -77,6 +77,9 @@ start() {
        return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+[ -f /var/glite/glite-lb-bkserverd.pid -a ! -f /var/run/glite/glite-lb-bkserverd.pid ] && mv -v /var/glite/glite-lb-bkserverd.pid /var/run/glite
+
 stop() {
        echo -n "Shutting down $prog: "
        killproc $prog