From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 15 Mar 2011 02:13:43 +0000 (+0000)
Subject: Fighting with BDII - it should work now.
X-Git-Tag: glite-lbjp-common-db_R_3_0_2_1~17
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=961ce2b175d3e99ff7393dd54f6719b80c3edc56;p=jra1mw.git

Fighting with BDII - it should work now.
---

diff --git a/org.glite.lb.yaim/config/functions/emi/config_info_service_lb b/org.glite.lb.yaim/config/functions/emi/config_info_service_lb
index ac47061..b28d47d 100644
--- a/org.glite.lb.yaim/config/functions/emi/config_info_service_lb
+++ b/org.glite.lb.yaim/config/functions/emi/config_info_service_lb
@@ -42,7 +42,7 @@ config_info_service_lb () {
 
 INFO_SERVICE_CONFIG='/etc/glite/info/service'
 INFO_SERVICE_SCRIPT='/usr/bin'
-INFO_PROVIDER_PATH='/var/run/bdii/gip/provider'
+INFO_PROVIDER_PATH='/var/lib/bdii/gip/provider'
 
 SERVICE=LBSERVER
 SERVICE_LC=lbserver
@@ -53,20 +53,25 @@ if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-service ]; then
   yaimlog ERROR "The script file for glite-info-service was not found in ${INFO_SERVICE_SCRIPT}."
   exit 1
 fi
-if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-service-glue2 ]; then
-  yaimlog ERROR "The script file for glite-info-service-glue2 was not found in ${INFO_SERVICE_SCRIPT}."
+if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-glue2-simple ]; then
+  yaimlog ERROR "The script file for glite-info-glue2-simple was not found in ${INFO_SERVICE_SCRIPT}."
   exit 1
 fi
 
 yaimlog DEBUG "Delete a previous version of the *.conf if it exists"
 rm -rf ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf
 
-yaimlog DEBUG "Create the glite-info-glue2-${SERVICE_LC}.conf file out of the template file"
+yaimlog DEBUG "Create the configuration files out of the template file"
 cp ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf.template ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf
 if [ $? != 0 ]; then
   yaimlog ERROR "Copying service template failed"
   exit 1
 fi
+cp ${INFO_SERVICE_CONFIG}/glite-info-glue2-${SERVICE_LC}.conf.template ${INFO_SERVICE_CONFIG}/glite-info-glue2-${SERVICE_LC}.conf
+if [ $? != 0 ]; then
+  yaimlog ERROR "Copying glue2 service template failed"
+  exit 1
+fi
 
 # Note: the configuration file may need to be altered if non standard values have been used. 
 
@@ -82,14 +87,10 @@ cat << EOF > ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wra
 export PATH=$PATH:${INFO_SERVICE_SCRIPT}
 export ${SERVICE}_HOST=${SERVICE_HOST}
 ${INFO_SERVICE_SCRIPT}/glite-info-service ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf $SITE_NAME
-${INFO_SERVICE_SCRIPT}/glite-info-service-glue2 ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf $SITE_NAME
+${INFO_SERVICE_SCRIPT}/glite-info-glue2-simple ${INFO_SERVICE_CONFIG}/glite-info-glue2-${SERVICE_LC}.conf $SITE_NAME
 EOF
 
 chmod +x ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wrapper 
- 
-  
 return 0
 
 }
-
-
diff --git a/org.glite.lb.yaim/config/node-info.d/emi/glite-lb b/org.glite.lb.yaim/config/node-info.d/emi/glite-lb
index d4528bb..ca33352 100644
--- a/org.glite.lb.yaim/config/node-info.d/emi/glite-lb
+++ b/org.glite.lb.yaim/config/node-info.d/emi/glite-lb
@@ -4,7 +4,6 @@ config_crl
 config_host_certs
 config_edgusers
 config_info_service_lb
-config_gip_service_release
 config_glite_lb
 config_glite_locallogger
 config_bdii_5.2
diff --git a/org.glite.px.myproxy-yaim/config/functions/emi/config_info_service_px b/org.glite.px.myproxy-yaim/config/functions/emi/config_info_service_px
index 826a3e9..0adb827 100644
--- a/org.glite.px.myproxy-yaim/config/functions/emi/config_info_service_px
+++ b/org.glite.px.myproxy-yaim/config/functions/emi/config_info_service_px
@@ -41,7 +41,7 @@ config_info_service_px () {
 
 INFO_SERVICE_CONFIG='/etc/glite/info/service'
 INFO_SERVICE_SCRIPT='/usr/bin'
-INFO_PROVIDER_PATH='/var/run/bdii/gip/provider'
+INFO_PROVIDER_PATH='/var/lib/bdii/gip/provider'
 
 SERVICE=MYPROXY
 SERVICE_HOST=${PX_HOST}
@@ -52,20 +52,25 @@ if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-service ]; then
   yaimlog ERROR "The script file for glite-info-service was not found in ${INFO_SERVICE_SCRIPT}."
   exit 1
 fi
-if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-service-glue2 ]; then
-  yaimlog ERROR "The script file for glite-info-service-glue2 was not found in ${INFO_SERVICE_SCRIPT}."
+if [ ! -x ${INFO_SERVICE_SCRIPT}/glite-info-glue2-simple ]; then
+  yaimlog ERROR "The script file for glite-info-glue2-simple was not found in ${INFO_SERVICE_SCRIPT}."
   exit 1
 fi
 
 yaimlog DEBUG "Delete a previous version of the *.conf if it exists"
 rm -rf ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf
 
-yaimlog DEBUG "Create the glite-info-service-${SERVICE_LC}.conf file out of the template file"
+yaimlog DEBUG "Create the configuration files out of the template file"
 cp ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf.template ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf
 if [ $? != 0 ]; then
   yaimlog ERROR "Copying service template failed"
   exit 1
 fi
+cp ${INFO_SERVICE_CONFIG}/glite-info-glue2-${SERVICE_LC}.conf.template ${INFO_SERVICE_CONFIG}/glite-info-glue2-${SERVICE_LC}.conf
+if [ $? != 0 ]; then
+  yaimlog ERROR "Copying glue2 service template failed"
+  exit 1
+fi
 
 # Note: the configuration file may need to be altered if non standard values have been used. 
 
@@ -81,12 +86,10 @@ cat << EOF > ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wra
 export PATH=$PATH:${INFO_SERVICE_SCRIPT}
 export ${SERVICE}_HOST=${SERVICE_HOST}
 ${INFO_SERVICE_SCRIPT}/glite-info-service ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf $SITE_NAME
-${INFO_SERVICE_SCRIPT}/glite-info-service-glue2 ${INFO_SERVICE_CONFIG}/glite-info-service-${SERVICE_LC}.conf $SITE_NAME
+${INFO_SERVICE_SCRIPT}/glite-info-glue2-simple ${INFO_SERVICE_CONFIG}/glite-info-glue2-${SERVICE_LC}.conf $SITE_NAME
 EOF
 
 chmod +x ${INFO_PROVIDER_PATH}/glite-info-provider-service-${SERVICE_LC}-wrapper 
- 
-  
 return 0
 
 }
diff --git a/org.glite.px.myproxy-yaim/config/node-info.d/emi/glite-px b/org.glite.px.myproxy-yaim/config/node-info.d/emi/glite-px
index 7b2298d..7f48931 100644
--- a/org.glite.px.myproxy-yaim/config/node-info.d/emi/glite-px
+++ b/org.glite.px.myproxy-yaim/config/node-info.d/emi/glite-px
@@ -33,7 +33,6 @@ PX_FUNCTIONS="
 config_crl
 config_host_certs
 config_edgusers
-config_gip_service_release
 config_proxy_server
 config_bdii_5.2
 config_info_service_px