From: František Dvořák Date: Tue, 22 Nov 2011 16:56:26 +0000 (+0000) Subject: Abandon glite-lb.pre file - yaim L&B function can be launched from differend nodes... X-Git-Tag: merge_30_head_take2_src~15 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=86262b3c65335c5730efdced035b733f4af03c40;p=jra1mw.git Abandon glite-lb.pre file - yaim L&B function can be launched from differend nodes (WMS). --- diff --git a/org.glite.lb.yaim/Makefile b/org.glite.lb.yaim/Makefile index a708753..0602341 100644 --- a/org.glite.lb.yaim/Makefile +++ b/org.glite.lb.yaim/Makefile @@ -20,9 +20,8 @@ all ${FILES}: if echo "${localstatedir}" | grep 'glite'>/dev/null; then \ glite_var="${localstatedir}"; \ fi; \ - sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $(top_srcdir)/config/defaults/glite-lb.pre > glite-lb.pre - - sed -e 's:@glite_etc@:${sysconfdir}:' $(top_srcdir)/config/functions/config_glite_lb.in > config_glite_lb + sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $(top_srcdir)/config/defaults/glite-lb.pre > glite-lb.pre; \ + sed -e 's:@glite_prefix@:${sysroot}${prefix}:' -e 's:@glite_etc@:${sysconfdir}:' -e "s:@glite_var@:$$glite_var:" $(top_srcdir)/config/functions/config_glite_lb.in > config_glite_lb # metapackage info echo -e "${gLiteCopyrightText}\n\n${gLiteLicenseText}" > LICENSE diff --git a/org.glite.lb.yaim/config/defaults/glite-lb.pre b/org.glite.lb.yaim/config/defaults/glite-lb.pre index 0902e5d..a3ba409 100644 --- a/org.glite.lb.yaim/config/defaults/glite-lb.pre +++ b/org.glite.lb.yaim/config/defaults/glite-lb.pre @@ -4,65 +4,65 @@ # system settings # -GLITE_LB_LOCATION='@glite_prefix@' -GLITE_LB_LOCATION_ETC='@glite_etc@' -GLITE_LB_LOCATION_VAR='@glite_var@' +#GLITE_LB_LOCATION='@glite_prefix@' +#GLITE_LB_LOCATION_ETC='@glite_etc@' +#GLITE_LB_LOCATION_VAR='@glite_var@' # query timeout -GLITE_WMS_QUERY_TIMEOUT=300 +#GLITE_WMS_QUERY_TIMEOUT=300 # CA certificates directory -X509_CERT_DIR='/etc/grid-security/certificates' +#X509_CERT_DIR='/etc/grid-security/certificates' # VOMS directory -X509_VOMS_DIR='/etc/grid-security/vomsdir' +#X509_VOMS_DIR='/etc/grid-security/vomsdir' # # purge and exports # # purge timeouts -GLITE_LB_EXPORT_PURGE_ARGS='--cleared 2d --aborted 15d --cancelled 15d --other 60d' +#GLITE_LB_EXPORT_PURGE_ARGS='--cleared 2d --aborted 15d --cancelled 15d --other 60d' # enable export of the purged jobs to the Job Provenance -GLITE_LB_EXPORT_ENABLED='false' +#GLITE_LB_EXPORT_ENABLED='false' # Job Provenance server -GLITE_LB_EXPORT_JPPS= +#GLITE_LB_EXPORT_JPPS= # prefix to the Job Provenance installation (if different from $GLITE_LB_LOCATION) -GLITE_JP_LOCATION= +#GLITE_JP_LOCATION= # # L&B configuration # # L&B service type (server/proxy/both), overrided by YAIM when needed -GLITE_LB_TYPE= +#GLITE_LB_TYPE= # configure glite-LB to be used with Real Time Monitor (harvester) -GLITE_LB_RTM_ENABLED='false' +#GLITE_LB_RTM_ENABLED='false' # MSG publish -GLITE_LB_MSG_BROKER='true' -GLITE_LB_MSG_NETWORK='PROD' -LCG_GFAL_INFOSYS='lcg-bdii.cern.ch:2170' +#GLITE_LB_MSG_BROKER='true' +#GLITE_LB_MSG_NETWORK='PROD' +#LCG_GFAL_INFOSYS='lcg-bdii.cern.ch:2170' # L&B authorization (items in list separated by comma) -GLITE_LB_SUPER_USERS= -GLITE_LB_WMS_DN= -GLITE_LB_RTM_DN='/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk' -GLITE_LB_AUTHZ_ADMIN_ACCESS= -GLITE_LB_AUTHZ_READ_ALL= -GLITE_LB_AUTHZ_READ_PURGE= -GLITE_LB_AUTHZ_STATUS_FOR_MONITORING= -GLITE_LB_AUTHZ_GET_STATISTICS= -GLITE_LB_AUTHZ_GRANT_OWNERSHIP= -GLITE_LB_AUTHZ_REGISTER_JOBS=".*" -GLITE_LB_AUTHZ_LOG_WMS_EVENTS=".*" -GLITE_LB_AUTHZ_LOG_CE_EVENTS=".*" -GLITE_LB_AUTHZ_LOG_GENERAL_EVENTS=".*" +#GLITE_LB_SUPER_USERS= +#GLITE_LB_WMS_DN= +#GLITE_LB_RTM_DN='/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk' +#GLITE_LB_AUTHZ_ADMIN_ACCESS= +#GLITE_LB_AUTHZ_READ_ALL= +#GLITE_LB_AUTHZ_READ_PURGE= +#GLITE_LB_AUTHZ_STATUS_FOR_MONITORING= +#GLITE_LB_AUTHZ_GET_STATISTICS= +#GLITE_LB_AUTHZ_GRANT_OWNERSHIP= +#GLITE_LB_AUTHZ_REGISTER_JOBS=".*" +#GLITE_LB_AUTHZ_LOG_WMS_EVENTS=".*" +#GLITE_LB_AUTHZ_LOG_CE_EVENTS=".*" +#GLITE_LB_AUTHZ_LOG_GENERAL_EVENTS=".*" # # additional options # # bkserver additional options -GLITE_LB_SERVER_OTHER_OPTIONS= +#GLITE_LB_SERVER_OTHER_OPTIONS= # notification interlogger additional options -GLITE_LB_NOTIF_IL_OTHER_OPTIONS= +#GLITE_LB_NOTIF_IL_OTHER_OPTIONS= # proxy interlogger additional options -GLITE_LB_PROXY_IL_OTHER_OPTIONS= +#GLITE_LB_PROXY_IL_OTHER_OPTIONS= diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb.in b/org.glite.lb.yaim/config/functions/config_glite_lb.in index 8d359ae..bbb7e39 100644 --- a/org.glite.lb.yaim/config/functions/config_glite_lb.in +++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in @@ -1,5 +1,5 @@ function config_glite_lb_check(){ - requires $1 MYSQL_PASSWORD INSTALL_ROOT GLITE_LOCATION GLITE_LB_LOCATION GLITE_LB_LOCATION_VAR GLITE_LB_LOCATION_ETC + requires $1 MYSQL_PASSWORD INSTALL_ROOT GLITE_LOCATION } # check directory existence first @@ -21,6 +21,7 @@ function config_glite_lb_libs_append() { function config_glite_lb_setenv(){ + # Redefine GLITE_USER to value used in packages yaimgridenv_set GLITE_USER glite # Redefine GLITE_HOME_DIR to make sure we retrieve the correct HOME directory of user glite GLITE_HOME_DIR=`getent passwd ${GLITE_USER} | cut -d: -f6` @@ -28,20 +29,20 @@ function config_glite_lb_setenv(){ yaimlog ERROR "The home directory of ${GLITE_USER} doesn't exist. Check whether the user ${GLITE_USER} was properly created" exit ${YEX_NOSUCHFILE} fi - yaimgridenv_set GLITE_WMS_QUERY_TIMEOUT "${GLITE_WMS_QUERY_TIMEOUT}" + yaimgridenv_set GLITE_WMS_QUERY_TIMEOUT "${GLITE_WMS_QUERY_TIMEOUT:-300}" yaimgridenv_set GLITE_HOST_CERT ${GLITE_HOME_DIR:-/home/glite}/.certs/hostcert.pem yaimgridenv_set GLITE_HOST_KEY ${GLITE_HOME_DIR:-/home/glite}/.certs/hostkey.pem - yaimgridenv_set X509_CERT_DIR "${X509_CERT_DIR}" - yaimgridenv_set X509_VOMS_DIR "${X509_VOMS_DIR}" + yaimgridenv_set X509_CERT_DIR "${X509_CERT_DIR:-/etc/grid-security/certificates}" + yaimgridenv_set X509_VOMS_DIR "${X509_VOMS_DIR:-/etc/grid-security/vomsdir}" yaimgridenv_set GLITE_LB_EXPORT_ENABLED ${GLITE_LB_EXPORT_ENABLED:-false} - yaimgridenv_set GLITE_LB_EXPORT_PURGE_ARGS "${GLITE_LB_EXPORT_PURGE_ARGS}" + yaimgridenv_set GLITE_LB_EXPORT_PURGE_ARGS "${GLITE_LB_EXPORT_PURGE_ARGS:---cleared 2d --aborted 15d --cancelled 15d --other 60d}" yaimgridenv_set GLITE_LB_EXPORT_JPPS ${GLITE_LB_EXPORT_JPPS:-} - yaimgridenv_set GLITE_LB_LOCATION "${GLITE_LB_LOCATION}" - yaimgridenv_set GLITE_LB_LOCATION_ETC "${GLITE_LB_LOCATION_ETC}" - yaimgridenv_set GLITE_LB_LOCATION_VAR "${GLITE_LB_LOCATION_VAR}" - yaimgridenv_set GLITE_JP_LOCATION "${GLITE_JP_LOCATION}" + yaimgridenv_set GLITE_LB_LOCATION "${GLITE_LB_LOCATION:-@glite_prefix@}" + yaimgridenv_set GLITE_LB_LOCATION_ETC "${GLITE_LB_LOCATION_ETC:-@glite_etc@}" + yaimgridenv_set GLITE_LB_LOCATION_VAR "${GLITE_LB_LOCATION_VAR:-@glite_var@}" + yaimgridenv_set GLITE_JP_LOCATION "${GLITE_JP_LOCATION:-}" yaimgridenv_set GLITE_LB_SERVER_OTHER_OPTIONS "${GLITE_LB_SERVER_OTHER_OPTIONS}" yaimgridenv_set GLITE_LB_NOTIF_IL_OTHER_OPTIONS "${GLITE_LB_NOTIF_IL_OTHER_OPTIONS}" @@ -97,6 +98,25 @@ function config_glite_lb_setenv(){ config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/apr-dev config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/aprutil-dev config_glite_lb_libs_append ${INSTALL_ROOT:-'/opt'}/activemq-cpp-library + + GLITE_LB_RTM_ENABLED="${GLITE_LB_RTM_ENABLED:-false}" + GLITE_LB_MSG_BROKER="${GLITE_LB_MSG_BROKER:-true}" + GLITE_LB_MSG_NETWORK="${GLITE_LB_MSG_NETWORK:-PROD}" + LCG_GFAL_INFOSYS="${LCG_GFAL_INFOSYS:-lcg-bdii.cern.ch:2170}" + + #GLITE_LB_SUPER_USERS="${GLITE_LB_SUPER_USERS:-}" + #GLITE_LB_WMS_DN="${GLITE_LB_WMS_DN:-}" + GLITE_LB_RTM_DN="${GLITE_LB_RTM_DN:-/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk}" + #GLITE_LB_AUTHZ_ADMIN_ACCESS="${GLITE_LB_AUTHZ_ADMIN_ACCESS:-}" + #GLITE_LB_AUTHZ_READ_ALL="${GLITE_LB_AUTHZ_READ_ALL:-}" + #GLITE_LB_AUTHZ_READ_PURGE="${GLITE_LB_AUTHZ_READ_PURGE:-}" + #GLITE_LB_AUTHZ_STATUS_FOR_MONITORING="${GLITE_LB_AUTHZ_STATUS_FOR_MONITORING:-}" + #GLITE_LB_AUTHZ_GET_STATISTICS="${GLITE_LB_AUTHZ_GET_STATISTICS:-}" + #GLITE_LB_AUTHZ_GRANT_OWNERSHIP="${GLITE_LB_AUTHZ_GRANT_OWNERSHIP:-}" + GLITE_LB_AUTHZ_REGISTER_JOBS="${GLITE_LB_AUTHZ_REGISTER_JOBS:-.*}" + GLITE_LB_AUTHZ_LOG_WMS_EVENTS="${GLITE_LB_AUTHZ_LOG_WMS_EVENTS:-.*}" + GLITE_LB_AUTHZ_LOG_CE_EVENTS="${GLITE_LB_AUTHZ_LOG_CE_EVENTS:-.*}" + GLITE_LB_AUTHZ_LOG_GENERAL_EVENTS="${GLITE_LB_AUTHZ_LOG_GENERAL_EVENTS:-.*}" } function config_glite_lb_authz() {