Move runtime files in setup script (upgrade from L&B <= 4.0.1).

diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index 1911eae..85940f9 100755 (executable)
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -115,6 +115,9 @@ setup_all() {
        setup_bdii=1
        setup_emir=1
        setup_upgrade=1
+       setup_upgrade_logger=1
+       setup_upgrade_notif=1
+       setup_upgrade_proxy=1
        setup_crl=1
        setup_startup=1
 }
@@ -133,7 +136,9 @@ OPTIONS are:
        -h,--help .... usage
 
 ACTIONS are:
-       db certs msg authz harvester bdii emir upgrade crl startup
+       db certs msg authz harvester bdii emir
+       upgrade upgrade_logger upgrade_notif upgrade_proxy
+       crl startup
        krb    .... setup Kerberos
        krbgsi .... setup Kerberos and enable GSI autentization
 
@@ -175,7 +180,14 @@ EOF
        harvester) setup_harvester=1 ;;
        bdii)   setup_bdii=1 ;;
        emir)   setup_emir=1 ;;
-       upgrade) setup_upgrade=1 ;;
+       upgrade) setup_upgrade=1;
+               setup_upgrade_logger=1;
+               setup_upgrade_notif=1;
+               setup_upgrade_proxy=1
+               ;;
+       upgrade_logger) setup_upgrade_logger=1 ;;
+       upgrade_notif) setup_upgrade_notif=1 ;;
+       upgrade_proxy) setup_upgrade_proxy=1 ;;
        crl)    setup_crl=1 ;;
        startup) setup_startup=1 ;;
        krb)    setup_krb=1 ;;
@@ -590,6 +602,25 @@ if test "$setup_upgrade" = "1"; then
        rm -fv /etc/cron.d/glite-lb-purge.cron /etc/logrotate.d/lb-purger /etc/logrotate.d/lb-lcas
 fi
 
+if test "$setup_upgrade_logger" = "1"; then
+       # upgrade from L&B <= 4.0.1
+       rm -f /tmp/interlogger.sock
+       if test -d /var/glite/log; then
+               find /var/glite/log -type f -name dglogd.log.\* -exec mv {} /var/spool/glite/lb-locallogger \;
+       fi
+fi
+
+if test "$setup_upgrade_notif" = "1"; then
+       # upgrade from L&B <= 4.0.1
+       rm -f /tmp/glite-lb-notif.sock
+       find /var/tmp/glite-lb-notif.\* -type f -name dglogd.log.\* -exec mv {} /var/spool/lb-notif \;
+fi
+
+if test "$setup_upgrade_proxy" = "1"; then
+       # upgrade from L&B <= 4.0.1
+       rm -f /tmp/glite-lbproxy-ilog.sock
+       find /tmp/glite-lbproxy-ilog_events.\* -type f -name dglogd.log.\* -exec mv {} /var/spool/lb-proxy \;
+fi
 
 # ==== fetch CRL ====
 

diff --git a/org.glite.lb.server/doc/glite-lb-setup.8 b/org.glite.lb.server/doc/glite-lb-setup.8
index 8b727fc..0bdb39b 100644 (file)
--- a/org.glite.lb.server/doc/glite-lb-setup.8
+++ b/org.glite.lb.server/doc/glite-lb-setup.8
@@ -30,7 +30,7 @@ List \fBACTIONS\fR to be executed and exit. This option can be used to view and/
 Display help.
 
 .SH ACTIONS
-\fBACTIONS\fR are individual tasks or groups of tasks to be performed during setup.
+ACTIONS are individual tasks or groups of tasks to be performed during setup.
 
 .TP
 \fBall\fR (group)
@@ -66,7 +66,7 @@ Creates file \fI/etc/glite-lb/glite-lb-authz.conf\fR based on all of the followi
 
 .TP
 \fBharvester\fR
-If enabled, L&B harvester will use local L&B server.
+If enabled ($GLITE_LB_HARVESTER_ENABLED), L&B harvester will be set up and launched. It will be configured to gather notifications from local L&B server.
 
 .TP
 \fBbdii\fR
@@ -82,7 +82,19 @@ Package \fIemird\fR or \fIemir-serp\fR must be intalled for this action to take
 
 .TP
 \fBupgrade\fR
-Checks for various obsolete files to remove.
+Checks for various obsolete files to move or remove.
+
+.TP
+\fBupgrade_logger\fR (part of upgrade action)
+Move L&B logger event files, if needed (upgrade from L&B >= 4.0.1).
+
+.TP
+\fBupgrade_notif\fR (part of upgrade action)
+Move L&B notification event files, if needed (upgrade from L&B >= 4.0.1).
+
+.TP
+\fBupgrade_proxy\fR (part of upgrade action)
+Move L&B proxy event files, if needed (upgrade from L&B >= 4.0.1).
 
 .TP
 \fBcrl\fR