Change and unify runtime files locations defaults (SB #98940):

- log file prefix to /var/spool
- sockets and pidfiles to /var/run
- glite-lb-proxy-interlogd with proxy-specific defaults
- update packaging + prefer macros in directory names
- move initscripts to /etc/rc.d/init.d for RedHat-like systems
- using ghost files

diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec
index 8430b2f..adb2fd1 100644 (file)
--- a/org.glite.lb.client/project/glite-lb-client.spec
+++ b/org.glite.lb.client/project/glite-lb-client.spec
@@ -83,37 +83,37 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
+%dir %{_docdir}/%{name}-%{version}/
 %{_libdir}/libglite_lb_client.so.*
 %{_libdir}/libglite_lb_clientpp.so.*
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
+%{_docdir}/%{name}-%{version}/ChangeLog
+%{_docdir}/%{name}-%{version}/LICENSE
 
 %files devel
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/examples/
-%dir /usr/share/emi/
-%dir /usr/share/emi/build/
-%dir /usr/share/emi/build/m4/
+%dir %{_docdir}/%{name}-%{version}/examples/
+%dir %{_datadir}/emi/
+%dir %{_datadir}/emi/build/
+%dir %{_datadir}/emi/build/m4/
 %dir %{_includedir}/glite/
 %dir %{_includedir}/glite/lb/
 %{_includedir}/glite/lb/*.h
 %{_libdir}/libglite_lb_client.so
 %{_libdir}/libglite_lb_clientpp.so
-/usr/share/doc/%{name}-%{version}/examples/*
-/usr/share/emi/build/m4/glite_lb.m4
+%{_docdir}/%{name}-%{version}/examples/*
+%{_datadir}/emi/build/m4/glite_lb.m4
 
 %files progs
 %defattr(-,root,root)
-%dir /usr/%{_lib}/glite-lb/
-%dir /usr/%{_lib}/glite-lb/examples/
+%dir %{_libdir}/glite-lb/
+%dir %{_libdir}/glite-lb/examples/
 %{_bindir}/glite-lb-logevent
 %{_bindir}/glite-lb-notify
 %{_bindir}/glite-lb-register_sandbox
 %{_libdir}/glite-lb/examples/*
-/usr/share/doc/%{name}-%{version}/README-notify
-/usr/share/man/man1/glite-lb-notify.1.gz
-/usr/share/man/man1/glite-lb-logevent.1.gz
+%{_docdir}/%{name}-%{version}/README-notify
+%{_mandir}/man1/glite-lb-notify.1.gz
+%{_mandir}/man1/glite-lb-logevent.1.gz
 
 
 %changelog

diff --git a/org.glite.lb.common/interface/log_proto.h b/org.glite.lb.common/interface/log_proto.h
index 1d4eee0..b79a24e 100644 (file)
--- a/org.glite.lb.common/interface/log_proto.h
+++ b/org.glite.lb.common/interface/log_proto.h
@@ -46,8 +46,20 @@ extern "C" {
 /**
  * default prefix for names of log files 
  */
-/** default prefix */
-#define EDG_WLL_LOG_PREFIX_DEFAULT              "/var/glite/log/dglogd.log"
+/** default prefix of logd files */
+#define EDG_WLL_LOG_PREFIX_DEFAULT              "/var/spool/glite/lb-locallogger/dglogd.log"
+/** default prefix of proxy files */
+#define EDG_WLL_PROXY_PREFIX_DEFAULT            "/var/spool/glite/lb-proxy/dglogd.log"
+/** default prefix of notification files */
+#define EDG_WLL_NOTIF_PREFIX_DEFAULT            "/var/spool/glite/lb-notif/dglogd.log"
+
+
+/**
+ * default locations of sockets
+ */
+#define EDG_WLL_LOG_SOCKET_DEFAULT              "/var/run/glite/glite-lb-interlogger.sock"
+#define EDG_WLL_PROXY_SOCKET_DEFAULT            "/var/run/glite/glite-lb-proxy.sock"
+#define EDG_WLL_NOTIF_SOCKET_DEFAULT            "/var/run/glite/glite-lb-notif.sock"
 
 
 /** 

diff --git a/org.glite.lb.doc/project/glite-lb-doc.spec b/org.glite.lb.doc/project/glite-lb-doc.spec
index 64c331b..b968c7a 100644 (file)
--- a/org.glite.lb.doc/project/glite-lb-doc.spec
+++ b/org.glite.lb.doc/project/glite-lb-doc.spec
@@ -48,17 +48,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
-%dir /usr/share/doc/%{name}-%{version}/examples/
-/usr/share/doc/%{name}-%{version}/examples/*
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/README
-/usr/share/doc/%{name}-%{version}/LBAG.pdf
-/usr/share/doc/%{name}-%{version}/LBUG.pdf
-/usr/share/doc/%{name}-%{version}/LBDG.pdf
-/usr/share/doc/%{name}-%{version}/LBTG.pdf
-/usr/share/doc/%{name}-%{version}/LBTP.pdf
+%dir %{_docdir}/%{name}-%{version}/
+%dir %{_docdir}/%{name}-%{version}/examples/
+%{_docdir}/%{name}-%{version}/examples/*
+%{_docdir}/%{name}-%{version}/ChangeLog
+%{_docdir}/%{name}-%{version}/LICENSE
+%{_docdir}/%{name}-%{version}/README
+%{_docdir}/%{name}-%{version}/LBAG.pdf
+%{_docdir}/%{name}-%{version}/LBUG.pdf
+%{_docdir}/%{name}-%{version}/LBDG.pdf
+%{_docdir}/%{name}-%{version}/LBTG.pdf
+%{_docdir}/%{name}-%{version}/LBTP.pdf
 
 
 %changelog

diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup
index af9b265..ea32b73 100755 (executable)
--- a/org.glite.lb.harvester/config/startup
+++ b/org.glite.lb.harvester/config/startup
@@ -40,7 +40,7 @@ GLITE_HOST_KEY=${GLITE_HOST_KEY:-"$GLITE_HOME/.certs/hostkey.pem"}
 [ -f @defaultdir@/glite-lb ] && . @defaultdir@/glite-lb
 [ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
 
-pidfile=${GLITE_LB_HARVESTER_PIDFILE:-"$GLITE_LB_LOCATION_VAR/glite-lb-harvester.pid"}
+pidfile=${GLITE_LB_HARVESTER_PIDFILE:-'/var/run/glite/glite-lb-harvester.pid'}
 level=${GLITE_LB_HARVESTER_DEBUG_LEVEL:-"1"}
 lockfile=/var/lock/glite-lb-harvester
 

diff --git a/org.glite.lb.harvester/project/debian.preinst b/org.glite.lb.harvester/project/debian.preinst
index b794d76..9e1877f 100644 (file)
--- a/org.glite.lb.harvester/project/debian.preinst
+++ b/org.glite.lb.harvester/project/debian.preinst
@@ -3,7 +3,7 @@ set -e
 
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
+mkdir -p /var/glite /var/run/glite 2>/dev/null || :
+chown glite:glite /var/glite /var/run/glite
 
 #DEBHELPER#

diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index ca7a323..cccd592 100644 (file)
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -48,7 +48,12 @@ mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-harvester
+mkdir $RPM_BUILD_ROOT/etc/rc.d
+mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+mkdir -p $RPM_BUILD_ROOT/var/glite
+mkdir -p $RPM_BUILD_ROOT/var/run/glite
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-harvester.pid
 
 
 %clean
@@ -58,8 +63,6 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
 exit 0
 
 
@@ -85,20 +88,23 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}/
-%dir /etc/glite-lb/
-%dir /usr/%{_lib}/glite-lb/
-%dir /usr/%{_lib}/glite-lb/examples/
-%dir /usr/share/glite/
-/etc/init.d/glite-lb-harvester
+%dir %attr(0755, glite, glite) %{_localstatedir}/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/run/glite
+%dir %{_docdir}/%{name}-%{version}/
+%dir %{_sysconfdir}/glite-lb/
+%dir %{_libdir}/glite-lb/
+%dir %{_libdir}/glite-lb/examples/
+%dir %{_datadir}/glite/
+%ghost %{_localstatedir}/run/glite/glite-lb-harvester.pid
+%{_initrddir}/glite-lb-harvester
 %{_bindir}/glite-lb-harvester
 %{_libdir}/glite-lb/examples/glite-lb-harvester-test.sh
 %{_libdir}/glite-lb/examples/glite-lb-harvester-dbg
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/README
-/usr/share/glite/*
-/usr/share/man/man1/glite-lb-harvester.1.gz
+%{_docdir}/%{name}-%{version}/ChangeLog
+%{_docdir}/%{name}-%{version}/LICENSE
+%{_docdir}/%{name}-%{version}/README
+%{_datadir}/glite/*
+%{_mandir}/man1/glite-lb-harvester.1.gz
 
 
 %changelog

diff --git a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
index 88f2802..456d33d 100644 (file)
--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
@@ -57,15 +57,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog config/msg.conf.example
-%dir /etc/glite-lb/
-%dir /usr/%{_lib}/glite-lb/
-%dir /usr/%{_lib}/glite-lb/examples/
-/etc/cron.d/glite-lb-logger-msg
+%dir %{_sysconfdir}/glite-lb/
+%dir %{_libdir}/glite-lb/
+%dir %{_libdir}/glite-lb/examples/
+%{_sysconfdir}/cron.d/glite-lb-logger-msg
 %{_libdir}/activemq_cpp_plugin.so
 %{_libdir}/activemq_cpp_plugin.so.0
 %{_libdir}/activemq_cpp_plugin.so.0.0.0
 %{_libdir}/glite-lb/examples/glite-lb-cmsclient
-/usr/sbin/glite-lb-msg-*
+%{_sbindir}/glite-lb-msg-*
 
 
 %changelog

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 19410aa..a284f2b 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -44,14 +44,13 @@ ifdef LB_PERF
        INTERLOGD:=glite-lb-interlogd-perf \
                   glite-lb-interlogd-perf-empty 
 #                 glite-lb-interlogd-perf-inline-empty
-       NOTIF_INTERLOGD:=glite-lb-notif-interlogd
        LB_PERF_FLAGS:=-DLB_PERF
 else
        LOGD:=glite-lb-logd
        INTERLOGD:=glite-lb-interlogd
-       NOTIF_INTERLOGD:=glite-lb-notif-interlogd
-       WS_INTERLOGD:=glite-lb-ws-interlogd
 endif
+NOTIF_INTERLOGD:=glite-lb-notif-interlogd
+PROXY_INTERLOGD:=glite-lb-proxy-interlogd
 
 ifeq (${thrflavour},)
 default_thrflavour=
@@ -225,6 +224,7 @@ install:
        ${INSTALL} -m 755 ${LOGD} ${DESTDIR}${PREFIX}${prefix}/bin
        ${INSTALL} -m 755 ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin
        ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin
+       ln -sf ${INTERLOGD} ${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-proxy-interlogd
 ifdef LB_PERF
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin
        ${INSTALL} -m 755 ${top_srcdir}/src/perftest_ll.sh ${DESTDIR}${PREFIX}${prefix}/sbin

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index 7275dbe..087789d 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -44,9 +44,9 @@ LOG4C_RCPATH="$GLITE_LOCATION_ETC/glite-lb"
 [ -f @defaultdir@/glite-lb ] && . @defaultdir@/glite-lb
 [ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
 
-LL_PIDFILE=${LL_PIDFILE:-$GLITE_LB_LOCATION_VAR/glite-lb-logd.pid}
-IL_PIDFILE=${IL_PIDFILE:-$GLITE_LB_LOCATION_VAR/glite-lb-interlogd.pid}
-IL_SOCKFILE=/tmp/interlogger.sock
+LL_PIDFILE=/var/run/glite/glite-lb-logd.pid
+IL_PIDFILE=/var/run/glite/glite-lb-interlogd.pid
+IL_SOCKFILE=/var/run/glite/glite-lb-interlogger.sock
 
 lockfile=/var/lock/glite-lb-locallogger
 
@@ -150,7 +150,7 @@ start()
                -i $LL_PIDFILE $port $sock $fprefix"
 
        start_daemon "glite-lb-interlogd" "$IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-interlogd \
-               -i $IL_PIDFILE $sock $fprefix" "$IL_SOCKFILE"
+               -i $IL_PIDFILE $sock $fprefix" "${GLITE_LB_IL_SOCK:-$IL_SOCKFILE}"
 }
 
 killwait()

diff --git a/org.glite.lb.logger/doc/glite-lb-interlogd.8 b/org.glite.lb.logger/doc/glite-lb-interlogd.8
index 1728b09..1141ace 100644 (file)
--- a/org.glite.lb.logger/doc/glite-lb-interlogd.8
+++ b/org.glite.lb.logger/doc/glite-lb-interlogd.8
@@ -69,7 +69,7 @@ Don't run as daemon (do not fork and put itself into background). Additional dia
 
 .TP
 .BI \-i " FILE" "\fR,\fP --pidfile " FILE
-Store process id into this file rather than default /var/glite/glite-lb-[notif]-interlogd.pid
+Store process id into this file rather than default /var/glite/glite-lb-[notif|proxy]-interlogd.pid
 
 .TP
 .BI \-f " PREFIX" "\fR,\fP --file-prefix " PREFIX
@@ -83,12 +83,12 @@ protocol+server prefix from the jobid and appending the rest to this
 .I PREFIX.
 
 .I PREFIX
-defaults to /var/glite/log/dglogd.log.
+defaults to /var/spool/glite/lb-locallogger/dglogd.log, /var/spool/glite/lb-proxy/dglogd.log, or /var/spool/glite/lb-notif/dglogd.log.
 
 On startup, interlogger checks all files matching the pattern
 .I PREFIX*.
 
-The value has to be same as used in the cooperating glite-lb-logd.
+The value has to be same as used in the cooperating glite-lb-logd (or glite-lb-bkserverd for proxy).
 
 .TP
 .BI \-k " FILE" "\fR,\fP --key " FILE
@@ -131,13 +131,13 @@ Print help and exit.
 
 .SH FILES
 .TP
-.I /tmp/interlogger.sock
-Default name of local socket.
+.I /var/run/glite-lb-*.sock
+Default name of local socket for logger, notification logger and proxy logger.
 .TP
-.I /var/glite/log/dglogd.log*
-Default location of event files.
-
-.I /var/glite/log/dglogd.log*.ctl
+.I /var/spool/glite/lb-*/dglogd.log*
+Default locations of event files.
+.TP
+.I /var/spool/glite/lb-*/dglogd.log*.ctl
 Interlogger's control files keeping the information on status of
 the corresponding event file wrt. delivery to the target server.
 
@@ -173,7 +173,7 @@ is set, it is used to locate proxy certificate file.
 Please, report all bugs to EU EGEE Bug Tracking System located at https://savannah.cern.ch
 
 .SH SEE ALSO
-.B te-lb-bkserverd\fR(8),\fP glite-lb-logd\fR(8),\fP glite-lb-logevent\fR(1),\fP
+.B glite-lb-bkserverd\fR(8),\fP glite-lb-logd\fR(8),\fP glite-lb-logevent\fR(1),\fP
 
 .SH AUTHOR
 EU EGEE, JRA1.

diff --git a/org.glite.lb.logger/project/debian.preinst b/org.glite.lb.logger/project/debian.preinst
index b794d76..9de75bf 100644 (file)
--- a/org.glite.lb.logger/project/debian.preinst
+++ b/org.glite.lb.logger/project/debian.preinst
@@ -3,7 +3,7 @@ set -e
 
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
+mkdir -p /var/glite /var/run/glite /var/spool/glite/lb-locallogger /var/spool/glite/lb-notif /var/spool/glite/lb-proxy 2>/dev/null || :
+chown glite:glite /var/glite /var/run/glite /var/spool/glite/lb-locallogger /var/spool/glite/lb-notif /var/spool/glite/lb-proxy
 
 #DEBHELPER#

diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index aa03bcd..061ffa1 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -57,7 +57,21 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-locallogger
+mkdir $RPM_BUILD_ROOT/etc/rc.d
+mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+mkdir -p $RPM_BUILD_ROOT/var/glite
+mkdir -p $RPM_BUILD_ROOT/var/run/glite
+mkdir -p $RPM_BUILD_ROOT/var/spool/glite/lb-locallogger
+mkdir -p $RPM_BUILD_ROOT/var/spool/glite/lb-notif
+mkdir -p $RPM_BUILD_ROOT/var/spool/glite/lb-proxy
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-interlogger.sock
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-notif.sock
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-proxy.sock
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-interlogd.pid
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-logd.pid
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-notif-interlogd.pid
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-proxy-interlogd.pid
 
 
 %clean
@@ -67,8 +81,6 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
 exit 0
 
 
@@ -94,13 +106,27 @@ fi
 
 %files
 %defattr(-,root,root)
+%dir %attr(0755, glite, glite) %{_localstatedir}/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/run/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite/lb-locallogger
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite/lb-notif
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite/lb-proxy
 %doc LICENSE project/ChangeLog
-/etc/init.d/glite-lb-locallogger
-%{_bindir}/glite-lb-notif-interlogd
+%ghost %{_localstatedir}/run/glite/glite-lb-interlogger.sock
+%ghost %{_localstatedir}/run/glite/glite-lb-notif.sock
+%ghost %{_localstatedir}/run/glite/glite-lb-proxy.sock
+%ghost %{_localstatedir}/run/glite/glite-lb-interlogd.pid
+%ghost %{_localstatedir}/run/glite/glite-lb-logd.pid
+%ghost %{_localstatedir}/run/glite/glite-lb-notif-interlogd.pid
+%ghost %{_localstatedir}/run/glite/glite-lb-proxy-interlogd.pid
+%{_initrddir}/glite-lb-locallogger
 %{_bindir}/glite-lb-interlogd
 %{_bindir}/glite-lb-logd
-/usr/share/man/man8/glite-lb-interlogd.8.gz
-/usr/share/man/man8/glite-lb-logd.8.gz
+%{_bindir}/glite-lb-notif-interlogd
+%{_bindir}/glite-lb-proxy-interlogd
+%{_mandir}/man8/glite-lb-interlogd.8.gz
+%{_mandir}/man8/glite-lb-logd.8.gz
 
 %files devel
 %defattr(-,root,root)

diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c
index 2d2b590..f54f791 100644 (file)
--- a/org.glite.lb.logger/src/interlogd.c
+++ b/org.glite.lb.logger/src/interlogd.c
@@ -29,6 +29,7 @@ limitations under the License.
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
+#include <libgen.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 
@@ -41,13 +42,16 @@ limitations under the License.
 
 #define EXIT_FAILURE 1
 #if defined(IL_NOTIFICATIONS)
-#define DEFAULT_PREFIX "/tmp/notif_events"
-#define DEFAULT_SOCKET "/tmp/notif_interlogger.sock"
-#define DEFAULT_PIDFILE "/var/glite/glite-lb-notif-interlogd.pid"
+#define DEFAULT_PREFIX EDG_WLL_NOTIF_PREFIX_DEFAULT
+#define DEFAULT_SOCKET EDG_WLL_NOTIF_SOCKET_DEFAULT
+#define DEFAULT_PIDFILE "/var/run/glite/glite-lb-notif-interlogd.pid"
 #else
 #define DEFAULT_PREFIX EDG_WLL_LOG_PREFIX_DEFAULT
-#define DEFAULT_SOCKET "/tmp/interlogger.sock"
-#define DEFAULT_PIDFILE  "/var/glite/glite-lb-interlogd.pid"
+#define DEFAULT_SOCKET EDG_WLL_LOG_SOCKET_DEFAULT
+#define DEFAULT_PIDFILE  "/var/run/glite/glite-lb-interlogd.pid"
+#define DEFAULT_PROXY_PREFIX EDG_WLL_PROXY_PREFIX_DEFAULT
+#define DEFAULT_PROXY_SOCKET EDG_WLL_PROXY_SOCKET_DEFAULT
+#define DEFAULT_PROXY_PIDFILE  "/var/run/glite/glite-lb-proxy-interlogd.pid"
 #endif
 
 
@@ -64,6 +68,8 @@ pthread_mutex_t cred_handle_lock = PTHREAD_MUTEX_INITIALIZER;
 time_t key_mtime = 0, cert_mtime = 0;
 
 static char *pidfile = DEFAULT_PIDFILE;
+char *file_prefix = DEFAULT_PREFIX;
+char *socket_path = DEFAULT_SOCKET;
 
 static void usage (int status)
 {
@@ -75,18 +81,21 @@ static void usage (int status)
               "  -V, --version              output version information and exit\n"
               "  -d, --debug                do not run as daemon\n"
               "  -f, --file-prefix <prefix> path and prefix for event files\n"
+              "                             (default: %s)\n"
               "  -c, --cert <file>          location of server certificate\n"
               "  -k, --key  <file>          location of server private key\n"
               "  -C, --CAdir <dir>          directory containing CA certificates\n"
               "  -b, --book                 send events to bookkeeping server only\n"
-              "  -i, --pidfile                  pid file\n"
+              "  -i, --pidfile               pid file\n"
+              "                             (default: %s)\n"
               "  -l, --log-server <host>    specify address of log server\n"
               "  -s, --socket <path>        non-default path of local socket\n"
+              "                             (default: %s)\n"
               "  -L, --lazy [<timeout>]     be lazy when closing connections to servers (default, timeout==0 means turn lazy off)\n"
               "  -p, --parallel [<num>]     use <num> parallel streams to the same server\n"
               "  -q, --queue-low <num>      queue length that enables another insertions\n"
               "  -Q, --queue-high <num>     max queue length\n"
-                  "  -F, --conf <file>                  load configuration from config file\n"
+              "  -F, --conf <file>          load configuration from config file\n"
 #ifdef LB_PERF
               "  -n, --nosend               PERFTEST: consume events instead of sending\n"
               "  -S, --nosync               PERFTEST: do not check logd files for lost events\n"
@@ -97,14 +106,13 @@ static void usage (int status)
               "  -j, --njobs <n>            PERFTEST: number of jobs to send\n"
 #endif
 #endif
-              , program_name, program_name);
+              , program_name, program_name, file_prefix, pidfile, socket_path);
        exit(status);
 }
 
 
 /* Option flags and variables */
 static int debug;
-char *file_prefix = DEFAULT_PREFIX;
 int bs_only = 0;
 int lazy_close = 1;
 int default_close_timeout;
@@ -122,7 +130,6 @@ char *cert_file = NULL;
 char *key_file  = NULL;
 char *CAcert_dir = NULL;
 char *log_server = NULL;
-char *socket_path = DEFAULT_SOCKET;
 static char *conf_file = NULL;
 static char *config = NULL;
 
@@ -415,6 +422,16 @@ main (int argc, char **argv)
   int ret;
   FILE *pidf;
 
+#ifndef IL_NOTIFICATIONS
+  p = strdup(argv[0]);
+  program_name = basename(p);
+  if (strcmp(program_name, "glite-lb-proxy-interlogd") == 0) {
+    file_prefix = DEFAULT_PROXY_PREFIX;
+    socket_path = DEFAULT_PROXY_SOCKET;
+    pidfile = DEFAULT_PROXY_PIDFILE;
+  }
+  free(p);
+#endif
   program_name = argv[0];
 
   setlinebuf(stdout);

diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c
index 8a81197..bc7bf21 100644 (file)
--- a/org.glite.lb.logger/src/logd.c
+++ b/org.glite.lb.logger/src/logd.c
@@ -48,7 +48,7 @@ limitations under the License.
 #include "glite/lb/lb_perftest.h"
 #endif
 
-#define DEFAULT_PIDFILE "/var/glite/glite-lb-logd.pid"
+#define DEFAULT_PIDFILE "/var/run/glite/glite-lb-logd.pid"
 
 typedef void (*logd_handler_t)(int);
 
@@ -64,8 +64,7 @@ static int noAuth = 0;
 static int noIPC = 0;
 static int noParse = 0;
 
-#define DEFAULT_SOCKET "/tmp/interlogger.sock"
-char *socket_path = DEFAULT_SOCKET;
+char *socket_path = EDG_WLL_LOG_SOCKET_DEFAULT;
 
 extern int confirm_sock;
 extern char confirm_sock_name[256];

diff --git a/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec b/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
index 5f94c3f..7caf7eb 100644 (file)
--- a/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
+++ b/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
@@ -44,21 +44,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-chown nagios:nagios /usr/libexec/grid-monitoring/probes/emi.lb >/dev/null 2>&1 || :
-exit 0
-
-
 %files
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog
-%dir /usr/libexec/
-%dir /usr/libexec/grid-monitoring/
-%dir /usr/libexec/grid-monitoring/probes/
-%dir /usr/libexec/grid-monitoring/probes/emi.lb/
+%dir %{_libexecdir}/grid-monitoring/
+%dir %{_libexecdir}/grid-monitoring/probes/
+%dir %attr(0755, nagios, nagios) %{_libexecdir}/grid-monitoring/probes/emi.lb/
 %dir /var/lib/grid-monitoring/
 %dir /var/lib/grid-monitoring/emi.lb/
-/usr/libexec/grid-monitoring/probes/emi.lb/LB-probe
+%{_libexecdir}/grid-monitoring/probes/emi.lb/LB-probe
 
 
 %changelog

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index bb5e34b..8d1d227 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -46,17 +46,16 @@ LOG4C_RCPATH="$GLITE_LOCATION_ETC/glite-lb"
 [ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
 
 [ -n "$GLITE_LB_SERVER_PIDFILE" ] && BK_PIDFILE=$GLITE_LB_SERVER_PIDFILE ||
-       BK_PIDFILE=$GLITE_LB_LOCATION_VAR/glite-lb-bkserverd.pid
-[ -z "$GLITE_LB_NOTIF_SOCK" ] && GLITE_LB_NOTIF_SOCK="/tmp/glite-lb-notif.sock"
+       BK_PIDFILE=/var/run/glite/glite-lb-bkserverd.pid
 [ -n "$GLITE_JP_IMPORTER_PIDFILE" ] && jp_importer_pidfile=$GLITE_JP_IMPORTER_PIDFILE ||
        jp_importer_pidfile=$GLITE_LB_LOCATION_VAR/glite-jp-importer.pid
 
 GLITE_LB_TYPE=${GLITE_LB_TYPE:-'server'} # server, proxy, both
-GLITE_LB_PROXY_SOCK=${GLITE_LB_PROXY_SOCK:-'/tmp/glite-lbproxy-ilog.sock'}
-GLITE_LB_PROXY_FPREFIX=${GLITE_LB_PROXY_FPREFIX:-'/tmp/glite-lbproxy-ilog_events'}
+GLITE_LB_NOTIF_SOCK=${GLITE_LB_NOTIF_SOCK:-'/var/run/glite/glite-lb-notif.sock'}
+GLITE_LB_PROXY_SOCK=${GLITE_LB_PROXY_SOCK:-'/var/run/glite/glite-lb-proxy.sock'}
 
-PROXY_IL_PIDFILE=$GLITE_LB_LOCATION_VAR/glite-lb-proxy-interlogd.pid
-NOTIF_IL_PIDFILE=$GLITE_LB_LOCATION_VAR/glite-lb-notif-interlogd.pid
+PROXY_IL_PIDFILE=/var/run/glite/glite-lb-proxy-interlogd.pid
+NOTIF_IL_PIDFILE=/var/run/glite/glite-lb-notif-interlogd.pid
 
 msgconf="$GLITE_LOCATION_ETC/glite-lb/msg.conf"
 if [ -f "$msgconf" ]; then
@@ -66,7 +65,7 @@ fi
 
 lockfile=/var/lock/glite-lb-bkserverd
 
-unset creds port env
+unset creds env bkargs notifargs
 
 start_daemon()
 {
@@ -220,9 +219,16 @@ start()
                [ -n "$GLITE_LB_EXPORT_JPPS" ] && jpps="--jpps $GLITE_LB_EXPORT_JPPS"
        fi
 
-       [ -n "$GLITE_LB_SERVER_PORT" ] && port="-p $GLITE_LB_SERVER_PORT"
-       [ -n "$GLITE_LB_SERVER_WPORT" ] && wport="-w $GLITE_LB_SERVER_WPORT"
-       [ -z "$GLITE_LB_NOTIF_FPREFIX" ] && GLITE_LB_NOTIF_FPREFIX="/var/tmp/glite-lb-notif"
+       [ -n "$GLITE_LB_SERVER_PORT" ] && bkargs="$bkargs -p $GLITE_LB_SERVER_PORT"
+       [ -n "$GLITE_LB_SERVER_WPORT" ] && bkargs="$bkargs -w $GLITE_LB_SERVER_WPORT"
+       if [ -n "$GLITE_LB_NOTIF_SOCK" ]; then
+               bkargs="$bkargs --notif-il-sock=$GLITE_LB_NOTIF_SOCK"
+               notifargs="$notifargs -s $GLITE_LB_NOTIF_SOCK"
+       fi
+       if [ -n "$GLITE_LB_NOTIF_FPREFIX" ]; then
+               bkargs="$bkargs --notif-il-fprefix=$GLITE_LB_NOTIF_FPREFIX"
+               notifargs="$notifargs -f $GLITE_LB_NOTIF_FPREFIX"
+       fi
        if [ -n "$GLITE_LB_SERVER_DEBUG" ] ; then
                if which tscat >/dev/null; then
                        GLITE_LB_SERVER_OTHER_OPTIONS="$GLITE_LB_SERVER_OTHER_OPTIONS -d -s 1 2>&1 | tscat >> $GLITE_LB_LOCATION_VAR/lb.log &"
@@ -232,28 +238,34 @@ start()
                        GLITE_LB_NOTIF_OTHER_OPTIONS="$GLITE_LB_NOTIF_OTHER_OPTIONS -v -d >> $GLITE_LB_LOCATION_VAR/notif-il.log 2>&1 &"
                fi
        fi
+       if [ -n "$GLITE_LB_PROXY_SOCK" ]; then
+               bkproxy="--proxy-il-sock $GLITE_LB_PROXY_SOCK"
+               ilproxy="-s $GLITE_LB_PROXY_SOCK"
+       fi
+       if [ -n "$GLITE_LB_PROXY_FPREFIX" ]; then
+               bkproxy="$bkproxy --proxy-il-fprefix $GLITE_LB_PROXY_FPREFIX"
+               ilproxy="$ilproxy -f $GLITE_LB_PROXY_FPREFIX"
+       fi
        case "$GLITE_LB_TYPE" in
        proxy)
-               proxy="-P --proxy-il-sock $GLITE_LB_PROXY_SOCK --proxy-il-fprefix $GLITE_LB_PROXY_FPREFIX"
+               bkproxy="-P $bkproxy"
                ;;
        both)
-               proxy="-B --proxy-il-sock $GLITE_LB_PROXY_SOCK --proxy-il-fprefix $GLITE_LB_PROXY_FPREFIX"
+               bkproxy="-B $bkproxy"
                ;;
        *)
-               proxy=''
+               bkproxy=''
                ;;
        esac
 
        start_daemon glite-lb-bkserver "$BK_PIDFILE" "$lcas_log $GLITE_LOCATION/bin/glite-lb-bkserverd \
-               --notif-il-sock=$GLITE_LB_NOTIF_SOCK \
-               --notif-il-fprefix=$GLITE_LB_NOTIF_FPREFIX \
-               $super -i $BK_PIDFILE $port $wport $dumpdir $purgedir $lbreg_maildir $proxy $policy\
+               $super -i $BK_PIDFILE $bkargs $dumpdir $purgedir $lbreg_maildir $bkproxy $policy\
                $GLITE_LB_SERVER_OTHER_OPTIONS" "/tmp/lb_proxy_serve.sock /tmp/lb_proxy_store.sock"
 
        if test -x $GLITE_LOCATION/bin/glite-lb-notif-interlogd; then
                start_daemon glite-lb-notif-interlogd "$NOTIF_IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-notif-interlogd \
-                       -f $GLITE_LB_NOTIF_FPREFIX -s $GLITE_LB_NOTIF_SOCK \
                        -i $NOTIF_IL_PIDFILE -M 10485760 \
+                       $notifargs \
                        $GLITE_LB_NOTIF_IL_OTHER_OPTIONS" "$GLITE_LB_NOTIF_SOCK"
        else
                echo Warning: glite-lb-notif-interlogd not installed, LB notifications will not work
@@ -268,13 +280,12 @@ start()
        fi
 
        if test x"$GLITE_LB_TYPE" = x"proxy" -o x"$GLITE_LB_TYPE" = x"both" ; then
-               if test -x $GLITE_LOCATION/bin/glite-lb-interlogd; then
-                       start_daemon "glite-lb-interlog for proxy" "$PROXY_IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-interlogd \
-                               -f $GLITE_LB_PROXY_FPREFIX -s $GLITE_LB_PROXY_SOCK \
-                               -i $PROXY_IL_PIDFILE \
+               if test -x $GLITE_LOCATION/bin/glite-lb-proxy-interlogd; then
+                       start_daemon glite-lb-proxy-interlogd "$PROXY_IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-proxy-interlogd \
+                               -i $PROXY_IL_PIDFILE $ilproxy \
                                $GLITE_LB_PROXY_IL_OTHER_OPTIONS" "$GLITE_LB_PROXY_SOCK"
                else
-                       echo Warning: glite-lb-interlogd not installed, logging to LB proxy will not work
+                       echo Warning: glite-lb-proxy-interlogd not installed, logging to LB proxy will not work
                fi
        fi
 }

diff --git a/org.glite.lb.server/project/debian.preinst b/org.glite.lb.server/project/debian.preinst
index b794d76..9de75bf 100644 (file)
--- a/org.glite.lb.server/project/debian.preinst
+++ b/org.glite.lb.server/project/debian.preinst
@@ -3,7 +3,7 @@ set -e
 
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
+mkdir -p /var/glite /var/run/glite /var/spool/glite/lb-locallogger /var/spool/glite/lb-notif /var/spool/glite/lb-proxy 2>/dev/null || :
+chown glite:glite /var/glite /var/run/glite /var/spool/glite/lb-locallogger /var/spool/glite/lb-notif /var/spool/glite/lb-proxy
 
 #DEBHELPER#

diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 06682ec..8ac6057 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -74,10 +74,18 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-bkserverd
+mkdir $RPM_BUILD_ROOT/etc/rc.d
+mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
 install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+mkdir -p $RPM_BUILD_ROOT/var/glite
+mkdir -p $RPM_BUILD_ROOT/var/run/glite
+mkdir -p $RPM_BUILD_ROOT/var/spool/glite/lb-locallogger
+mkdir -p $RPM_BUILD_ROOT/var/spool/glite/lb-notif
+mkdir -p $RPM_BUILD_ROOT/var/spool/glite/lb-proxy
+touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-bkserverd.pid
 
 
 %clean
@@ -87,8 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
 exit 0
 
 
@@ -114,26 +120,33 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir /etc/cron.d/
-%dir /etc/glite-lb/
-%dir /usr/share/doc/%{name}-%{version}
-%dir /usr/share/glite/
-/usr/share/doc/%{name}-%{version}/ChangeLog
-/usr/share/doc/%{name}-%{version}/LICENSE
-/usr/share/doc/%{name}-%{version}/glite-lb
-%config(noreplace) /etc/logrotate.d/glite-lb-server
-%config(noreplace) /etc/mysql/conf.d/glite-lb-server.cnf
-%config(noreplace) /etc/glite-lb/*
-%config(noreplace missingok) /etc/sysconfig/glite-lb
-/etc/cron.d/*
-/etc/init.d/glite-lb-bkserverd
+%dir %attr(0755, glite, glite) %{_localstatedir}/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/run/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite/lb-locallogger
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite/lb-notif
+%dir %attr(0755, glite, glite) %{_localstatedir}/spool/glite/lb-proxy
+%dir %{_datadir}/glite/
+%dir %{_docdir}/%{name}-%{version}
+%dir %{_sysconfdir}/cron.d/
+%dir %{_sysconfdir}/glite-lb/
+%config(noreplace) %{_sysconfdir}/glite-lb/*
+%config(noreplace) %{_sysconfdir}/logrotate.d/glite-lb-server
+%config(noreplace) %{_sysconfdir}/mysql/conf.d/glite-lb-server.cnf
+%config(noreplace missingok) %{_sysconfdir}/sysconfig/glite-lb
+%ghost %{_localstatedir}/run/glite/glite-lb-bkserverd.pid
+%{_docdir}/%{name}-%{version}/ChangeLog
+%{_docdir}/%{name}-%{version}/LICENSE
+%{_docdir}/%{name}-%{version}/glite-lb
+%{_sysconfdir}/cron.d/*
+%{_initrddir}/glite-lb-bkserverd
 %{_bindir}/*
-/usr/sbin/*
-/usr/share/glite/*
-/usr/share/man/man1/glite-lb-mon-db.1.gz
-/usr/share/man/man8/glite-lb-bkindex.8.gz
-/usr/share/man/man8/glite-lb-bkserverd.8.gz
-/usr/share/man/man8/glite-lb-setup.8.gz
+%{_sbindir}/*
+%{_datadir}/glite/*
+%{_mandir}/man1/glite-lb-mon-db.1.gz
+%{_mandir}/man8/glite-lb-bkindex.8.gz
+%{_mandir}/man8/glite-lb-bkserverd.8.gz
+%{_mandir}/man8/glite-lb-setup.8.gz
 
 
 %changelog

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 7655638..e50ccd1 100644 (file)
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -122,7 +122,7 @@ extern void _start (void), etext (void);
 
 /* file to store pid and generate semaphores key */
 #ifndef EDG_BKSERVERD_PIDFILE
-#define EDG_BKSERVERD_PIDFILE  "/var/run/glite-lb-bkserverd.pid"
+#define EDG_BKSERVERD_PIDFILE  "/var/run/glite/glite-lb-bkserverd.pid"
 #endif
 
 #ifndef GLITE_LBPROXY_SOCK_PREFIX

diff --git a/org.glite.lb.server/src/il_lbproxy.c b/org.glite.lb.server/src/il_lbproxy.c
index debe75d..862af1b 100644 (file)
--- a/org.glite.lb.server/src/il_lbproxy.c
+++ b/org.glite.lb.server/src/il_lbproxy.c
@@ -29,11 +29,9 @@ limitations under the License.
 
 #define FCNTL_ATTEMPTS         5
 #define FCNTL_TIMEOUT          1
-#define FILE_PREFIX            EDG_WLL_LOG_PREFIX_DEFAULT
-#define DEFAULT_SOCKET         "/tmp/interlogger.sock"
 
-char *lbproxy_ilog_socket_path = DEFAULT_SOCKET;
-char *lbproxy_ilog_file_prefix = FILE_PREFIX;
+char *lbproxy_ilog_socket_path = EDG_WLL_PROXY_SOCKET_DEFAULT;
+char *lbproxy_ilog_file_prefix = EDG_WLL_PROXY_PREFIX_DEFAULT;
 
 
 int

diff --git a/org.glite.lb.server/src/il_notification.c b/org.glite.lb.server/src/il_notification.c
index 947a1e2..b1dfa89 100644 (file)
--- a/org.glite.lb.server/src/il_notification.c
+++ b/org.glite.lb.server/src/il_notification.c
@@ -45,12 +45,10 @@ limitations under the License.
 
 #define FCNTL_ATTEMPTS         5
 #define FCNTL_TIMEOUT          1
-#define FILE_PREFIX             "/tmp/notif_events"
-#define DEFAULT_SOCKET          "/tmp/notif_interlogger.sock"
 #define NOTIF_TIMEOUT          1
 
-char *notif_ilog_socket_path = DEFAULT_SOCKET;
-char *notif_ilog_file_prefix = FILE_PREFIX;
+char *notif_ilog_socket_path = EDG_WLL_NOTIF_SOCKET_DEFAULT;
+char *notif_ilog_file_prefix = EDG_WLL_NOTIF_PREFIX_DEFAULT;
 
 
 static

diff --git a/org.glite.lb.types/project/glite-lb-types.spec b/org.glite.lb.types/project/glite-lb-types.spec
index 6806206..36454bb 100644 (file)
--- a/org.glite.lb.types/project/glite-lb-types.spec
+++ b/org.glite.lb.types/project/glite-lb-types.spec
@@ -43,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog
-%dir /usr/share/glite-lb/at3/
+%dir %{_datadir}/glite-lb/at3/
 %dir %{perl_vendorlib}/gLite/
 %dir %{perl_vendorlib}/gLite/LB/
 %dir %{_includedir}/glite/
@@ -53,9 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/glite/lb/*
 %{perl_vendorlib}/gLite/LB/StructField.pm
 %{perl_vendorlib}/gLite/LB/MultiStruct.pm
-/usr/share/glite-lb/at3/events.T
-/usr/share/glite-lb/at3/status.T
-/usr/share/glite-lb/at3/types.T
+%{_datadir}/glite-lb/at3/events.T
+%{_datadir}/glite-lb/at3/status.T
+%{_datadir}/glite-lb/at3/types.T
 
 
 %changelog

diff --git a/org.glite.lb.utils/project/glite-lb-utils.spec b/org.glite.lb.utils/project/glite-lb-utils.spec
index 0bb36c1..2772010 100644 (file)
--- a/org.glite.lb.utils/project/glite-lb-utils.spec
+++ b/org.glite.lb.utils/project/glite-lb-utils.spec
@@ -61,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glite-lb-purge
 %{_bindir}/glite-lb-state_history
 %{_bindir}/glite-lb-statistics
-/usr/share/man/*/*.gz
+%{_mandir}/*/*.gz
 
 
 %changelog

diff --git a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
index b4d78f5..2e576f5 100644 (file)
--- a/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
+++ b/org.glite.lb.ws-interface/project/glite-lb-ws-interface.spec
@@ -47,13 +47,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE project/ChangeLog
 %dir %{_includedir}/glite/
 %dir %{_includedir}/glite/lb/
-%dir /usr/share/wsdl/
-%dir /usr/share/wsdl/glite-lb/
+%dir %{_datadir}/wsdl/
+%dir %{_datadir}/wsdl/glite-lb/
 %{_includedir}/glite/lb/ws_interface_version.h
-/usr/share/wsdl/glite-lb/LB.wsdl
-/usr/share/wsdl/glite-lb/glue2.xsd
-/usr/share/wsdl/glite-lb/lb4agu.wsdl
-/usr/share/wsdl/glite-lb/LBTypes.wsdl
+%{_datadir}/wsdl/glite-lb/LB.wsdl
+%{_datadir}/wsdl/glite-lb/glue2.xsd
+%{_datadir}/wsdl/glite-lb/lb4agu.wsdl
+%{_datadir}/wsdl/glite-lb/LBTypes.wsdl
 
 
 %changelog

diff --git a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
index 64e45b9..480ddd5 100644 (file)
--- a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
+++ b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
@@ -49,8 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog
-%dir /usr/%{_lib}/glite-lb/
-%dir /usr/%{_lib}/glite-lb/examples/
+%dir %{_libdir}/glite-lb/
+%dir %{_libdir}/glite-lb/examples/
 %{_libdir}/glite-lb/examples/glite-lb-ws_getversion
 %{_libdir}/glite-lb/examples/glite-lb-ws_joblog
 %{_libdir}/glite-lb/examples/glite-lb-ws_lb4agu_GetActivityStatus

diff --git a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
index be94788..2309cca 100644 (file)
--- a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
+++ b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
@@ -60,14 +60,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /usr/share/doc/%{name}-%{version}
-%dir /etc/glite-lb
-%config(noreplace) /etc/glite-lb/log4crc
-%doc /usr/share/doc/%{name}-%{version}/ChangeLog
-%doc /usr/share/doc/%{name}-%{version}/LICENSE
-%doc /usr/share/doc/%{name}-%{version}/README
-%doc /usr/share/doc/%{name}-%{version}/log4crc.example-debugging
-%doc /usr/share/doc/%{name}-%{version}/log4crc.example-production
+%dir %{_docdir}/%{name}-%{version}
+%dir %{_sysconfdir}/glite-lb
+%config(noreplace) %{_sysconfdir}/glite-lb/log4crc
+%doc %{_docdir}/%{name}-%{version}/ChangeLog
+%doc %{_docdir}/%{name}-%{version}/LICENSE
+%doc %{_docdir}/%{name}-%{version}/README
+%doc %{_docdir}/%{name}-%{version}/log4crc.example-debugging
+%doc %{_docdir}/%{name}-%{version}/log4crc.example-production
 %{_libdir}/libglite_lbu_log.so.*
 
 %files devel

diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
index 0b540c3..c06174b 100644 (file)
--- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
+++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
@@ -71,9 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-proxy-renewald
+mkdir $RPM_BUILD_ROOT/etc/rc.d
+mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
+mkdir -p $RPM_BUILD_ROOT/var/glite
 
 
 %clean
@@ -89,8 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 %pre progs
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
-mkdir -p /var/glite /var/log/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/log/glite
 exit 0
 
 
@@ -134,12 +135,13 @@ fi
 
 %files progs
 %defattr(-,root,root)
+%dir %attr(0755, glite, glite) %{_localstatedir}/glite
 %doc LICENSE project/ChangeLog README
-/etc/init.d/glite-proxy-renewald
+%{_initrddir}/glite-proxy-renewald
 %{_bindir}/glite-proxy-renew
 %{_bindir}/glite-proxy-renewd
-/usr/share/man/man1/glite-proxy-renew.1.gz
-/usr/share/man/man8/glite-proxy-renewd.8.gz
+%{_mandir}/man1/glite-proxy-renew.1.gz
+%{_mandir}/man8/glite-proxy-renewd.8.gz
 
 
 %changelog