From 2b4396f2bf1cfc83791a664027c8e927e1fd7850 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 31 Mar 2010 11:48:34 +0000 Subject: [PATCH] Changed config directory from etc/lb to etc/glite-lb. Added symlinks to the original places too. --- org.glite.lb.logger/config/startup | 2 +- org.glite.lb.server/Makefile | 7 ++++--- org.glite.lb.server/config/startup | 6 +++--- org.glite.lb.yaim/config/functions/config_glite_lb | 10 +++++----- org.glite.lbjp-common.log/Makefile | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup index 16515e9..1454c9f 100755 --- a/org.glite.lb.logger/config/startup +++ b/org.glite.lb.logger/config/startup @@ -80,7 +80,7 @@ start() [ -n "$GLITE_LB_IL_SOCK" ] && sock="--socket $GLITE_LB_IL_SOCK" [ -n "$GLITE_LB_IL_FPREFIX" ] && fprefix="--file-prefix $GLITE_LB_IL_FPREFIX" - log4c="LOG4C_RCPATH='$GLITE_LOCATION/etc/lb'" + log4c="LOG4C_RCPATH='$GLITE_LOCATION/etc/glite-lb'" mkdir -p /var/glite/log chown $GLITE_USER /var/glite/log diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index d0d2374..2fd66fd 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -341,7 +341,7 @@ stage: compile $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: - -mkdir -p ${PREFIX}/bin ${PREFIX}/etc/lb ${PREFIX}/etc/init.d ${PREFIX}/interface + -mkdir -p ${PREFIX}/bin ${PREFIX}/etc/glite-lb ${PREFIX}/etc/init.d ${PREFIX}/interface -mkdir -p ${PREFIX}/share/doc/${package}-${version} -mkdir -p ${PREFIX}/share/man/man1 -mkdir -p ${PREFIX}/${libdir} @@ -358,9 +358,10 @@ install: ln -sf liblcas_lb.so ${PREFIX}/${libdir}/modules/lcas_lb.mod for f in dbsetup.sql index.conf.template; do \ - ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc/lb; \ + ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc/glite-lb; \ + ln -sf "glite-lb/glite-lb-$$f" "${PREFIX}/etc/glite-lb-$$f"; \ done - ${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${PREFIX}/etc/lb + ${INSTALL} -m 755 ${top_srcdir}/config/glite-lb-migrate_db2version20 ${PREFIX}/etc/glite-lb ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-bkserverd diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup index 9603aa4..0b1fdce 100755 --- a/org.glite.lb.server/config/startup +++ b/org.glite.lb.server/config/startup @@ -127,10 +127,10 @@ start() fi fi - log4c="LOG4C_RCPATH='$GLITE_LOCATION/etc/lb'" + log4c="LOG4C_RCPATH='$GLITE_LOCATION/etc/glite-lb'" - policy="$GLITE_LOCATION/etc/lb/glite-lb-authz.conf" - lcas_log="LCAS_LOG_FILE='/var/log/glite/glite-lb-lcas.log' LCAS_ETC_DIR='/opt/glite/etc/lb'" + policy="$GLITE_LOCATION/etc/glite-lb/glite-lb-authz.conf" + lcas_log="LCAS_LOG_FILE='/var/log/glite/glite-lb-lcas.log' LCAS_ETC_DIR='/opt/glite/etc/glite-lb'" if test -f "$policy"; then # lcas not enabled by default yet policy="--policy '$policy'" diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb b/org.glite.lb.yaim/config/functions/config_glite_lb index 055c356..eedf63d 100644 --- a/org.glite.lb.yaim/config/functions/config_glite_lb +++ b/org.glite.lb.yaim/config/functions/config_glite_lb @@ -54,7 +54,7 @@ function config_glite_lb_authz() { superusers="`echo \"$superusers\"| grep -v ^$ | tr ',' '\n' | sed 's/\(.*\)/\t\tsubject = \"\1\"/'`" rtm="`echo \"$rtm\"| grep -v ^$ | tr ',' '\n' | sed 's/\(.*\)/\t\tsubject = \"\1\"/'`" - authconf="$GLITE_LOCATION/etc/lb/glite-lb-authz.conf" + authconf="$GLITE_LOCATION/etc/glite-lb/glite-lb-authz.conf" cat < "$authconf".new resource "LB" { @@ -195,7 +195,7 @@ function config_glite_lb() { if [ ! $? = 0 ]; then mysql -u root --password="$MYSQL_PASSWORD" -e "CREATE DATABASE lbserver20" - mysql --password="$MYSQL_PASSWORD" lbserver20 < ${INSTALL_ROOT}/glite/etc/lb/glite-lb-dbsetup.sql + mysql --password="$MYSQL_PASSWORD" lbserver20 < ${INSTALL_ROOT}/glite/etc/glite-lb/glite-lb-dbsetup.sql mysql -u root --password="$MYSQL_PASSWORD" -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver IDENTIFIED BY '' WITH GRANT OPTION;" mysql -u root --password="$MYSQL_PASSWORD" -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver@'$HOSTNAME' IDENTIFIED BY '' WITH GRANT OPTION;" mysql -u root --password="$MYSQL_PASSWORD" -e "GRANT ALL PRIVILEGES on lbserver20.* to lbserver@localhost IDENTIFIED BY '' WITH GRANT OPTION;" @@ -301,7 +301,7 @@ EOF fi fi lcas_plugin="$GLITE_LOCATION/$lcas_libarch/modules/lcas_lb.mod" - echo "pluginname=\"$lcas_plugin\"" > ${INSTALL_ROOT}/etc/lb/lcas.db + echo "pluginname=\"$lcas_plugin\"" > ${INSTALL_ROOT}/etc/glite-lb/lcas.db # log file logfile=/var/log/glite/glite-lb-lcas.log touch $logfile @@ -331,8 +331,8 @@ EOF config_glite_lb_authz "$GLITE_LB_SUPER_USERS" "" fi - if [ ! -f ${GLITE_LOCATION}/etc/lb/glite-lb-harvester.conf ]; then - echo $HOSTNAME > ${GLITE_LOCATION}/etc/lb/glite-lb-harvester.conf + if [ ! -f ${GLITE_LOCATION}/etc/glite-lb/glite-lb-harvester.conf ]; then + echo $HOSTNAME > ${GLITE_LOCATION}/etc/glite-lb/glite-lb-harvester.conf fi . /opt/glite/etc/profile.d/grid-env.sh diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile index 24acb1a..f06bb75 100644 --- a/org.glite.lbjp-common.log/Makefile +++ b/org.glite.lbjp-common.log/Makefile @@ -67,8 +67,8 @@ install: compile mkdir -p ${PREFIX}/share/doc/${package}-${version} ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} ${INSTALL} -m 644 ${top_srcdir}/README ${PREFIX}/share/doc/${package}-${version} - mkdir -p ${PREFIX}/etc/lb - ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/etc/lb/log4crc + mkdir -p ${PREFIX}/etc/glite-lb + ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/etc/glite-lb/log4crc ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/share/doc/${package}-${version}/log4crc.example-production ${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${PREFIX}/share/doc/${package}-${version}/log4crc.example-debugging mkdir -p ${PREFIX}/${libdir} -- 1.8.2.3