Change home directory of glite user to be compliant with FHS (finalize SB #98940).

diff --git a/org.glite.lb.harvester/config/systemd.harvester b/org.glite.lb.harvester/config/systemd.harvester
index d719cb5..3a523ac 100644 (file)
--- a/org.glite.lb.harvester/config/systemd.harvester
+++ b/org.glite.lb.harvester/config/systemd.harvester
@@ -6,11 +6,11 @@ Documentation=man:glite-lb-setup(8) http://egee.cesnet.cz/en/JRA1/LB/documentati
 Type=forking
 User=glite
 Group=glite
-Environment=KRB5_KTNAME=FILE:/var/glite/krb5kt_lb
-Environment=KRB5CCNAME=FILE:/var/glite/krb5cc_lb
+Environment=KRB5_KTNAME=FILE:/var/lib/glite/krb5kt_lb
+Environment=KRB5CCNAME=FILE:/var/lib/glite/krb5cc_lb
 Environment=LOG4C_RCPATH=/etc/glite-lb
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 EnvironmentFile=-/etc/profile.d/grid-env.sh
 EnvironmentFile=-/etc/sysconfig/glite-lb
 PIDFile=/var/run/glite/glite-lb-harvester.pid

diff --git a/org.glite.lb.harvester/project/.pre b/org.glite.lb.harvester/project/.pre
index 27c196b..18d7862 100644 (file)
--- a/org.glite.lb.harvester/project/.pre
+++ b/org.glite.lb.harvester/project/.pre
@@ -1,5 +1,5 @@
 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/glite /var/log/glite 2>/dev/null || :
+chown glite:glite /var/lib/glite /var/log/glite
 exit 0

diff --git a/org.glite.lb.harvester/project/debian.preinst b/org.glite.lb.harvester/project/debian.preinst
index 9e1877f..fee0cd4 100644 (file)
--- a/org.glite.lb.harvester/project/debian.preinst
+++ b/org.glite.lb.harvester/project/debian.preinst
@@ -2,8 +2,8 @@
 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/run/glite 2>/dev/null || :
-chown glite:glite /var/glite /var/run/glite
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/glite /var/run/glite 2>/dev/null || :
+chown glite:glite /var/lib/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 4398d1c..fe8898d 100644 (file)
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -66,7 +66,7 @@ mkdir $RPM_BUILD_ROOT/etc/rc.d
 mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
 %endif
 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/lib/glite
 mkdir -p $RPM_BUILD_ROOT/var/run/glite
 touch $RPM_BUILD_ROOT/var/run/glite/glite-lb-harvester.pid
 
@@ -77,7 +77,7 @@ 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
 exit 0
 
 
@@ -129,7 +129,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir %attr(0755, glite, glite) %{_localstatedir}/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/lib/glite
 %dir %attr(0755, glite, glite) %{_localstatedir}/run/glite
 %dir %{_docdir}/%{name}-%{version}/
 %dir %{_sysconfdir}/glite-lb/

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index 69a4cd2..1473d35 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -34,8 +34,8 @@ GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6`
 GLITE_HOST_CERT=${GLITE_HOST_CERT:-"$GLITE_HOME/.certs/hostcert.pem"}
 GLITE_HOST_KEY=${GLITE_HOST_KEY:-"$GLITE_HOME/.certs/hostkey.pem"}
 
-KRB5_KTNAME="FILE:/var/glite/krb5kt_lb"
-KRB5CCNAME="FILE:/var/glite/krb5cc_lb"
+KRB5_KTNAME="FILE:$GLITE_HOME/krb5kt_lb"
+KRB5CCNAME="FILE:$GLITE_HOME/krb5cc_lb"
 LOG4C_RCPATH="$GLITE_LOCATION_ETC/glite-lb"
 
 [ -f /etc/profile.d/grid-env.sh ] && . /etc/profile.d/grid-env.sh
@@ -143,8 +143,6 @@ start()
        [ -n "$GLITE_LB_IL_SOCK" ] && sock="--socket $GLITE_LB_IL_SOCK"
        [ -n "$GLITE_LB_IL_FPREFIX" ] && fprefix="--file-prefix $GLITE_LB_IL_FPREFIX"
 
-       mkdir -p /var/glite/log 
-       chown $GLITE_USER /var/glite/log
         (cd /tmp && ls -f /tmp |grep ^dglogd_sock_ |xargs rm -f)
        start_daemon "glite-lb-logd" "$LL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-logd \
                -i $LL_PIDFILE $port $sock $fprefix"

diff --git a/org.glite.lb.logger/config/systemd.interlogd b/org.glite.lb.logger/config/systemd.interlogd
index 1bfe52b..8c24c73 100644 (file)
--- a/org.glite.lb.logger/config/systemd.interlogd
+++ b/org.glite.lb.logger/config/systemd.interlogd
@@ -6,11 +6,11 @@ Documentation=man:glite-lb-setup(8) http://egee.cesnet.cz/en/JRA1/LB/documentati
 Type=forking
 User=glite
 Group=glite
-Environment=KRB5_KTNAME=FILE:/var/glite/krb5kt_lb
-Environment=KRB5CCNAME=FILE:/var/glite/krb5cc_lb
+Environment=KRB5_KTNAME=FILE:/var/lib/glite/krb5kt_lb
+Environment=KRB5CCNAME=FILE:/var/lib/glite/krb5cc_lb
 Environment=LOG4C_RCPATH=/etc/glite-lb
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 EnvironmentFile=-/etc/profile.d/grid-env.sh
 EnvironmentFile=-/etc/sysconfig/glite-lb
 PIDFile=/var/run/glite/glite-lb-interlogd.pid

diff --git a/org.glite.lb.logger/config/systemd.logd b/org.glite.lb.logger/config/systemd.logd
index 447f76a..03245ec 100644 (file)
--- a/org.glite.lb.logger/config/systemd.logd
+++ b/org.glite.lb.logger/config/systemd.logd
@@ -7,11 +7,11 @@ After=network.target
 Type=forking
 User=glite
 Group=glite
-Environment=KRB5_KTNAME=FILE:/var/glite/krb5kt_lb
-Environment=KRB5CCNAME=FILE:/var/glite/krb5cc_lb
+Environment=KRB5_KTNAME=FILE:/var/lib/glite/krb5kt_lb
+Environment=KRB5CCNAME=FILE:/var/lib/glite/krb5cc_lb
 Environment=LOG4C_RCPATH=/etc/glite-lb
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 EnvironmentFile=-/etc/profile.d/grid-env.sh
 EnvironmentFile=-/etc/sysconfig/glite-lb
 PIDFile=/var/run/glite/glite-lb-logd.pid

diff --git a/org.glite.lb.logger/config/systemd.notif-interlogd b/org.glite.lb.logger/config/systemd.notif-interlogd
index 7f9cd61..e9eff02 100644 (file)
--- a/org.glite.lb.logger/config/systemd.notif-interlogd
+++ b/org.glite.lb.logger/config/systemd.notif-interlogd
@@ -6,11 +6,11 @@ Documentation=man:glite-lb-setup(8) http://egee.cesnet.cz/en/JRA1/LB/documentati
 Type=forking
 User=glite
 Group=glite
-Environment=KRB5_KTNAME=FILE:/var/glite/krb5kt_lb
-Environment=KRB5CCNAME=FILE:/var/glite/krb5cc_lb
+Environment=KRB5_KTNAME=FILE:/var/lib/glite/krb5kt_lb
+Environment=KRB5CCNAME=FILE:/var/lib/glite/krb5cc_lb
 Environment=LOG4C_RCPATH=/etc/glite-lb
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 EnvironmentFile=-/etc/profile.d/grid-env.sh
 EnvironmentFile=-/etc/sysconfig/glite-lb
 PIDFile=/var/run/glite/glite-lb-notif-interlogd.pid

diff --git a/org.glite.lb.logger/config/systemd.proxy-interlogd b/org.glite.lb.logger/config/systemd.proxy-interlogd
index 6248bf7..f2f1c67 100644 (file)
--- a/org.glite.lb.logger/config/systemd.proxy-interlogd
+++ b/org.glite.lb.logger/config/systemd.proxy-interlogd
@@ -6,11 +6,11 @@ Documentation=man:glite-lb-setup(8) http://egee.cesnet.cz/en/JRA1/LB/documentati
 Type=forking
 User=glite
 Group=glite
-Environment=KRB5_KTNAME=FILE:/var/glite/krb5kt_lb
-Environment=KRB5CCNAME=FILE:/var/glite/krb5cc_lb
+Environment=KRB5_KTNAME=FILE:/var/lib/glite/krb5kt_lb
+Environment=KRB5CCNAME=FILE:/var/lib/glite/krb5cc_lb
 Environment=LOG4C_RCPATH=/etc/glite-lb
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 EnvironmentFile=-/etc/profile.d/grid-env.sh
 EnvironmentFile=-/etc/sysconfig/glite-lb
 PIDFile=/var/run/glite/glite-lb-proxy-interlogd.pid

diff --git a/org.glite.lb.logger/project/.pre b/org.glite.lb.logger/project/.pre
index 27c196b..18d7862 100644 (file)
--- a/org.glite.lb.logger/project/.pre
+++ b/org.glite.lb.logger/project/.pre
@@ -1,5 +1,5 @@
 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/glite /var/log/glite 2>/dev/null || :
+chown glite:glite /var/lib/glite /var/log/glite
 exit 0

diff --git a/org.glite.lb.logger/project/debian.preinst b/org.glite.lb.logger/project/debian.preinst
index 9de75bf..ace6e24 100644 (file)
--- a/org.glite.lb.logger/project/debian.preinst
+++ b/org.glite.lb.logger/project/debian.preinst
@@ -2,8 +2,8 @@
 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/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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/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/lib/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 9f6570e..6fddd70 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -74,7 +74,7 @@ mkdir $RPM_BUILD_ROOT/etc/rc.d
 mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
 %endif
 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/lib/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
@@ -94,7 +94,7 @@ 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
 exit 0
 
 
@@ -161,7 +161,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir %attr(0755, glite, glite) %{_localstatedir}/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/lib/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

diff --git a/org.glite.lb.server/config/glite-lb b/org.glite.lb.server/config/glite-lb
index 9c54e09..bfa912a 100644 (file)
--- a/org.glite.lb.server/config/glite-lb
+++ b/org.glite.lb.server/config/glite-lb
@@ -18,8 +18,8 @@ GLITE_WMS_QUERY_TIMEOUT=300
 #X509_CERT_DIR='/etc/grid-security/certificates'
 # VOMS directory
 #X509_VOMS_DIR='/etc/grid-security/vomsdir'
-#GLITE_HOST_CERT='/var/glite/.certs/hostcert.pem'
-#GLITE_HOST_KEY='/var/glite/.certs/hostkey.pem'
+#GLITE_HOST_CERT='/var/lib/glite/.certs/hostcert.pem'
+#GLITE_HOST_KEY='/var/lib/glite/.certs/hostkey.pem'
 
 #
 # purge and exports

diff --git a/org.glite.lb.server/config/setup b/org.glite.lb.server/config/setup
index 5ae4f25..7f937c5 100755 (executable)
--- a/org.glite.lb.server/config/setup
+++ b/org.glite.lb.server/config/setup
@@ -663,14 +663,14 @@ if test "$setup_krb" = "1"; then
                        PRINC=`klist -k | grep "host/" | head -1 | awk '{print $2}'`
                fi
 
-               cp /etc/krb5.keytab /var/glite/krb5kt_lb || error="$error krb"
-               chown glite:glite /var/glite/krb5kt_lb
+               cp /etc/krb5.keytab $GLITE_HOME/krb5kt_lb || error="$error krb"
+               chown glite:glite $GLITE_HOME/krb5kt_lb
 
                cat > /etc/cron.d/glite-lb-ticket <<EOF
-0 */2 * * *    root    (ticket=/var/glite/krb5cc_lb; KRB5CCNAME="FILE:\${ticket}0" kinit -k $PRINC; chown glite:glite \${ticket}0; mv \${ticket}0 \$ticket)
+0 */2 * * *    root    (ticket=$GLITE_HOME/krb5cc_lb; KRB5CCNAME="FILE:\${ticket}0" kinit -k $PRINC; chown glite:glite \${ticket}0; mv \${ticket}0 \$ticket)
 EOF
-               KRB5CCNAME=/var/glite/krb5cc_lb kinit -k $PRINC
-               chown glite:glite /var/glite/krb5cc_lb
+               KRB5CCNAME=$GLITE_HOME/krb5cc_lb kinit -k $PRINC
+               chown glite:glite $GLITE_HOME/krb5cc_lb
 
                qecho "Kerberos configured"
        fi
@@ -739,6 +739,10 @@ if test "$setup_startup" = "1" -a "$startup_error" != "1"; then
 @fedora@       for i in bkserverd logd interlogd notif-interlogd proxy-interlogd harvester; do
 @fedora@               sed -e "s|\(X509_USER_CERT\).*|\1=$GLITE_HOST_CERT|" \
 @fedora@                   -e "s|\(X509_USER_KEY\).*|\1=$GLITE_HOST_KEY|" \
+@fedora@                   -e "s|\(KRB5_KTNAME\).*|\1=FILE:$GLITE_HOME/krb5kt_lb|" \
+@fedora@                   -e "s|\(KRB5CCNAME\).*|\1=FILE:$GLITE_HOME/krb5cc_lb|" \
+@fedora@                   -e "s|\(--dump-prefix\)=[^ \t]*|\1=$GLITE_HOME/dump |" \
+@fedora@                   -e "s|\(--purge-prefix\)=[^ \t]*|\1=$GLITE_HOME/purge |" \
 @fedora@                   $systemd_unitdir/glite-lb-$i.service > $systemd_confdir/glite-lb-$i.service
 @fedora@       done
 @fedora@       sed -i -e "s|\$GLITE_LB_SERVER_PROXY_OPTIONS |$GLITE_LB_SERVER_PROXY_OPTIONS|" $systemd_confdir/glite-lb-bkserverd.service

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 1921644..a7b7cb9 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -35,8 +35,8 @@ GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6`
 GLITE_HOST_CERT=${GLITE_HOST_CERT:-"$GLITE_HOME/.certs/hostcert.pem"}
 GLITE_HOST_KEY=${GLITE_HOST_KEY:-"$GLITE_HOME/.certs/hostkey.pem"}
 
-KRB5_KTNAME="FILE:/var/glite/krb5kt_lb"
-KRB5CCNAME="FILE:/var/glite/krb5cc_lb"
+KRB5_KTNAME="FILE:/var/lib/glite/krb5kt_lb"
+KRB5CCNAME="FILE:/var/lib/glite/krb5cc_lb"
 LOG4C_RCPATH="$GLITE_LOCATION_ETC/glite-lb"
 
 [ -f /etc/profile.d/grid-env.sh ] && . /etc/profile.d/grid-env.sh

diff --git a/org.glite.lb.server/config/systemd.bkserverd b/org.glite.lb.server/config/systemd.bkserverd
index 903384a..325d1d2 100644 (file)
--- a/org.glite.lb.server/config/systemd.bkserverd
+++ b/org.glite.lb.server/config/systemd.bkserverd
@@ -7,16 +7,16 @@ After=network.target mysqld.service
 Type=forking
 User=glite
 Group=glite
-Environment=KRB5_KTNAME=FILE:/var/glite/krb5kt_lb
-Environment=KRB5CCNAME=FILE:/var/glite/krb5cc_lb
+Environment=KRB5_KTNAME=FILE:/var/lib/glite/krb5kt_lb
+Environment=KRB5CCNAME=FILE:/var/lib/glite/krb5cc_lb
 Environment=LOG4C_RCPATH=/etc/glite-lb
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 EnvironmentFile=-/etc/profile.d/grid-env.sh
 EnvironmentFile=-/etc/sysconfig/glite-lb
 PIDFile=/var/run/glite/glite-lb-bkserverd.pid
 ExecStartPre=/bin/rm -f /tmp/lb_proxy_serve.sock /tmp/lb_proxy_store.sock
-ExecStart=/usr/bin/glite-lb-bkserverd --dump-prefix=/var/glite/dump --purge-prefix=/var/glite/purge --policy /etc/glite-lb/glite-lb-authz.conf $GLITE_LB_SERVER_PROXY_OPTIONS $GLITE_LB_SERVER_OPTIONS
+ExecStart=/usr/bin/glite-lb-bkserverd --dump-prefix=/var/lib/glite/dump --purge-prefix=/var/lib/glite/purge --policy /etc/glite-lb/glite-lb-authz.conf $GLITE_LB_SERVER_PROXY_OPTIONS $GLITE_LB_SERVER_OPTIONS
 
 [Install]
 WantedBy=multi-user.target

diff --git a/org.glite.lb.server/project/.pre b/org.glite.lb.server/project/.pre
index 27c196b..18d7862 100644 (file)
--- a/org.glite.lb.server/project/.pre
+++ b/org.glite.lb.server/project/.pre
@@ -1,5 +1,5 @@
 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/glite /var/log/glite 2>/dev/null || :
+chown glite:glite /var/lib/glite /var/log/glite
 exit 0

diff --git a/org.glite.lb.server/project/debian.preinst b/org.glite.lb.server/project/debian.preinst
index 9de75bf..ace6e24 100644 (file)
--- a/org.glite.lb.server/project/debian.preinst
+++ b/org.glite.lb.server/project/debian.preinst
@@ -2,8 +2,8 @@
 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/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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/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/lib/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 d8a9a05..e77e4e7 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -94,8 +94,8 @@ install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-
 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/dump
-mkdir -p $RPM_BUILD_ROOT/var/glite/purge
+mkdir -p $RPM_BUILD_ROOT/var/lib/glite/dump
+mkdir -p $RPM_BUILD_ROOT/var/lib/glite/purge
 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
@@ -109,7 +109,7 @@ 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
 exit 0
 
 
@@ -161,9 +161,9 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir %attr(0755, glite, glite) %{_localstatedir}/glite
-%dir %attr(0755, glite, glite) %{_localstatedir}/glite/dump
-%dir %attr(0755, glite, glite) %{_localstatedir}/glite/purge
+%dir %attr(0755, glite, glite) %{_localstatedir}/lib/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/lib/glite/dump
+%dir %attr(0755, glite, glite) %{_localstatedir}/lib/glite/purge
 %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

diff --git a/org.glite.lb.server/src/notif-keeper.sh.in b/org.glite.lb.server/src/notif-keeper.sh.in
index 8ec472b..bd7a037 100644 (file)
--- a/org.glite.lb.server/src/notif-keeper.sh.in
+++ b/org.glite.lb.server/src/notif-keeper.sh.in
@@ -218,7 +218,9 @@ else
 fi
 
 if [ -z "$GLITE_LB_LOCATION_VAR" ]; then
-       export GLITE_LB_LOCATION_VAR=/var/glite
+       GLITE_USER=${GLITE_USER:-'glite'}
+       GLITE_HOME=`getent passwd ${GLITE_USER} | cut -d: -f6`
+       export GLITE_LB_LOCATION_VAR=$GLITE_HOME
        vecho 1 "WARNING: GLITE_LB_LOCATION_VAR not specified, using default"
 fi
 

diff --git a/org.glite.lb.server/src/server_stats.c b/org.glite.lb.server/src/server_stats.c
index 0d7f2ea..2f49e85 100644 (file)
--- a/org.glite.lb.server/src/server_stats.c
+++ b/org.glite.lb.server/src/server_stats.c
@@ -64,8 +64,8 @@ int edg_wll_InitServerStatistics(edg_wll_Context ctx, char *prefix)
        if (! prefix){
                if (! (prefix = getenv("GLITE_LB_LOCATION_VAR"))) {
                        struct stat info;
-                       if (stat("/var/glite", &info) == 0 && S_ISDIR(info.st_mode))
-                               asprintf(&prefix, "/var/glite/");
+                       if (stat("/var/lib/glite", &info) == 0 && S_ISDIR(info.st_mode))
+                               asprintf(&prefix, "/var/lib/glite/");
                        else {
                                asprintf(&prefix, "/tmp/");
                                stats_in_tmp = 1;

diff --git a/org.glite.px.proxyrenewal/config/glite-px b/org.glite.px.proxyrenewal/config/glite-px
index 0511d38..053a30a 100644 (file)
--- a/org.glite.px.proxyrenewal/config/glite-px
+++ b/org.glite.px.proxyrenewal/config/glite-px
@@ -18,8 +18,8 @@
 #X509_CERT_DIR='/etc/grid-security/certificates'
 # VOMS directory
 #X509_VOMS_DIR='/etc/grid-security/vomsdir'
-#GLITE_HOST_CERT='/var/glite/.certs/hostcert.pem'
-#GLITE_HOST_KEY='/var/glite/.certs/hostkey.pem'
+#GLITE_HOST_CERT='/var/lib/glite/.certs/hostcert.pem'
+#GLITE_HOST_KEY='/var/lib/glite/.certs/hostkey.pem'
 
 #
 # additional options

diff --git a/org.glite.px.proxyrenewal/config/systemd.proxy-renewd b/org.glite.px.proxyrenewal/config/systemd.proxy-renewd
index 8dfc40a..e39ffdc 100644 (file)
--- a/org.glite.px.proxyrenewal/config/systemd.proxy-renewd
+++ b/org.glite.px.proxyrenewal/config/systemd.proxy-renewd
@@ -7,8 +7,8 @@ After=network.target
 Type=forking
 User=glite
 Group=glite
-Environment=X509_USER_CERT=/var/glite/.certs/hostcert.pem
-Environment=X509_USER_KEY=/var/glite/.certs/hostkey.pem
+Environment=X509_USER_CERT=/var/lib/glite/.certs/hostcert.pem
+Environment=X509_USER_KEY=/var/lib/glite/.certs/hostkey.pem
 # workaround for VOMS_FindByVO that seems to always require user's own VOMS config file (savannach bug #7511)
 Environment=VOMS_USERCONF=/tmp/renewal_vomses
 EnvironmentFile=-/etc/profile.d/grid-env.sh

diff --git a/org.glite.px.proxyrenewal/project/.pre b/org.glite.px.proxyrenewal/project/.pre
index 27c196b..18d7862 100644 (file)
--- a/org.glite.px.proxyrenewal/project/.pre
+++ b/org.glite.px.proxyrenewal/project/.pre
@@ -1,5 +1,5 @@
 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/glite /var/log/glite 2>/dev/null || :
+chown glite:glite /var/lib/glite /var/log/glite
 exit 0

diff --git a/org.glite.px.proxyrenewal/project/debian.preinst b/org.glite.px.proxyrenewal/project/debian.preinst
index b794d76..db09229 100644 (file)
--- a/org.glite.px.proxyrenewal/project/debian.preinst
+++ b/org.glite.px.proxyrenewal/project/debian.preinst
@@ -2,8 +2,8 @@
 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
+mkdir -p /var/lib/glite /var/log/glite 2>/dev/null || :
+chown glite:glite /var/lib/glite /var/log/glite
 
 #DEBHELPER#

diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
index 8bd4500..83e0b86 100644 (file)
--- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
+++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
@@ -89,7 +89,7 @@ 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
+mkdir -p $RPM_BUILD_ROOT/var/lib/glite
 mkdir -p $RPM_BUILD_ROOT/var/spool/glite-renewd
 
 
@@ -105,7 +105,7 @@ 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
+getent passwd glite >/dev/null || useradd -r -g glite -d /var/lib/glite -c "gLite user" glite
 exit 0
 
 
@@ -174,7 +174,7 @@ fi
 
 %files progs
 %defattr(-,root,root)
-%dir %attr(0755, glite, glite) %{_localstatedir}/glite
+%dir %attr(0755, glite, glite) %{_localstatedir}/lib/glite
 %dir %attr(0700, glite, glite) %{_localstatedir}/spool/glite-renewd
 %doc LICENSE project/ChangeLog README config/glite-px
 %config(noreplace missingok) %{_sysconfdir}/sysconfig/glite-px