From 7fe78a1dd82f2b9fc6bec4462bde5880ecb1d30a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Fri, 20 Apr 2007 09:09:29 +0000 Subject: [PATCH] update of deployment path --- org.glite.lb/deployment/deploy_all.diff | 192 +++++++++++++++++++------------- 1 file changed, 114 insertions(+), 78 deletions(-) diff --git a/org.glite.lb/deployment/deploy_all.diff b/org.glite.lb/deployment/deploy_all.diff index 6c4fba9..9c608b8 100644 --- a/org.glite.lb/deployment/deploy_all.diff +++ b/org.glite.lb/deployment/deploy_all.diff @@ -1,45 +1,43 @@ Index: org.glite/project/global.dependencies.properties =================================================================== RCS file: /cvs/jra1mw/org.glite/project/global.dependencies.properties,v -retrieving revision 1.482.2.279 -diff -u -p -u -r1.482.2.279 global.dependencies.properties ---- org.glite/project/global.dependencies.properties 4 Aug 2006 12:21:59 -0000 1.482.2.279 -+++ org.glite/project/global.dependencies.properties 1 Sep 2006 14:23:09 -0000 -@@ -1819,7 +1819,25 @@ ext.globus-sdk.description = The Globus +retrieving revision 1.482.2.279.2.59 +diff -u -r1.482.2.279.2.59 global.dependencies.properties +--- org.glite/project/global.dependencies.properties 16 Apr 2007 17:13:30 -0000 1.482.2.279.2.59 ++++ org.glite/project/global.dependencies.properties 20 Apr 2007 09:06:21 -0000 +@@ -2093,6 +2093,24 @@ ext.globus-sdk.rpm.name = vdt_globus_sdk ext.globus-sdk.rpm.version = ${ext.vdt.version} ext.globus-sdk.rpm.age = ${ext.vdt.age} -- -+ ++ +# Globus vdt data server - grid ftp server -+ext.globus-data-server.name = ${ext.globus.name} -+ext.globus-data-server.vendor = ${ext.globus.vendor} -+ext.globus-data-server.version = ${ext.globus.version} -+ext.globus-data-server.platform = ${platform} -+ext.globus-data-server.subdir = ${ext.globus-data-server.name}/${ext.globus-data-server.version}/${ext.globus-data-server.platform} -+ext.globus-data-server.rep.base = ${jra1.rep.base} -+ext.globus-data-server.rep.file = -+ext.globus-data-server.rep.subdir = -+ext.globus-data-server.rep.url = ${ext.globus-data-server.rep.base}/${ext.globus-data-server.subdir}/${ext.globus-data-server.rep.subdir}/${ext.globus-data-server.rep.file} -+ext.globus-data-server.files = -+ext.globus-data-server.download = http://www.cs.wisc.edu/vdt/releases/1.2.2/installing-rpms.html -+ext.globus-data-server.homepage = http://www.cs.wisc.edu/vdt//index.html -+ext.globus-data-server.description = The Globus Toolkit(R). This is the version packaged by VDT. -+ext.globus-data-server.rpm.name = vdt_globus_data_server -+ext.globus-data-server.rpm.version = ${ext.vdt.version} -+ext.globus-data-server.rpm.age = 1 -+ ++ext.globus-data-server.name = ${ext.globus.name} ++ext.globus-data-server.vendor = ${ext.globus.vendor} ++ext.globus-data-server.version = ${ext.globus.version} ++ext.globus-data-server.platform = ${platform} ++ext.globus-data-server.subdir = ${ext.globus-data-server.name}/${ext.globus-data-server.version}/${ext.globus-data-server.platform} ++ext.globus-data-server.rep.base = ${jra1.rep.base} ++ext.globus-data-server.rep.file = ++ext.globus-data-server.rep.subdir = ++ext.globus-data-server.rep.url = ${ext.globus-data-server.rep.base}/${ext.globus-data-server.subdir}/${ext.globus-data-server.rep.subdir}/${ext.globus-data-server.rep.file} ++ext.globus-data-server.files = ++ext.globus-data-server.download = http://www.cs.wisc.edu/vdt/releases/1.2.2/installing-rpms.html ++ext.globus-data-server.homepage = http://www.cs.wisc.edu/vdt//index.html ++ext.globus-data-server.description = The Globus Toolkit(R). This is the version packaged by VDT. ++ext.globus-data-server.rpm.name = vdt_globus_data_server ++ext.globus-data-server.rpm.version = ${ext.vdt.version} ++ext.globus-data-server.rpm.age = 1 + # GPT ext.gpt.name = gpt - ext.gpt.vendor = gpt Index: org.glite.deployment/build.xml =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment/build.xml,v -retrieving revision 1.61.2.2.2.12.2.26 -diff -u -p -u -r1.61.2.2.2.12.2.26 build.xml ---- org.glite.deployment/build.xml 24 Apr 2006 13:39:27 -0000 1.61.2.2.2.12.2.26 -+++ org.glite.deployment/build.xml 1 Sep 2006 14:23:09 -0000 -@@ -1619,6 +1619,39 @@ +retrieving revision 1.62 +diff -u -r1.62 build.xml +--- org.glite.deployment/build.xml 22 Aug 2005 17:00:02 -0000 1.62 ++++ org.glite.deployment/build.xml 20 Apr 2007 09:06:21 -0000 +@@ -814,6 +814,39 @@ @@ -79,7 +77,7 @@ diff -u -p -u -r1.61.2.2.2.12.2.26 build.xml -@@ -1730,6 +1763,8 @@ +@@ -891,6 +924,8 @@ wn, wms, lb, @@ -91,27 +89,27 @@ diff -u -p -u -r1.61.2.2.2.12.2.26 build.xml Index: org.glite.deployment/project/dependencies.properties =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment/project/dependencies.properties,v -retrieving revision 1.526.2.5.2.127.2.415.2.203 -diff -u -p -u -r1.526.2.5.2.127.2.415.2.203 dependencies.properties ---- org.glite.deployment/project/dependencies.properties 30 Aug 2006 07:41:36 -0000 1.526.2.5.2.127.2.415.2.203 -+++ org.glite.deployment/project/dependencies.properties 1 Sep 2006 14:23:09 -0000 -@@ -47,6 +47,8 @@ - org.glite.deployment.hydra.version = glite-deployment-hydra_R_1_0_3 - org.glite.deployment.io-client.version = glite-deployment-io-client_R_2_2_0 - org.glite.deployment.io-server.version = glite-deployment-io-server_R_2_1_8 -+ org.glite.deployment.jpps.version = HEAD -+ org.glite.deployment.jpis.version = HEAD - org.glite.deployment.lb.version = glite-deployment-lb_R_2_2_4 - org.glite.deployment.lcg-CE_torque.version = glite-deployment-lcg-CE_torque_R_3_0_4 - org.glite.deployment.lcg-CE.version = glite-deployment-lcg-CE_R_3_0_5 +retrieving revision 1.529 +diff -u -r1.529 dependencies.properties +--- org.glite.deployment/project/dependencies.properties 21 Jun 2006 09:29:08 -0000 1.529 ++++ org.glite.deployment/project/dependencies.properties 20 Apr 2007 09:06:21 -0000 +@@ -33,6 +33,8 @@ + org.glite.deployment.wn.version = HEAD + org.glite.deployment.wms.version = HEAD + org.glite.deployment.lb.version = HEAD ++org.glite.deployment.jpps.version = HEAD ++org.glite.deployment.jpis.version = HEAD + org.glite.deployment.io-server.version = HEAD + org.glite.deployment.io-client.version = HEAD + org.glite.deployment.ce.version = HEAD Index: org.glite.deployment/project/glite.deployment.csf.xml =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment/project/glite.deployment.csf.xml,v -retrieving revision 1.44.2.1.2.11.2.24 -diff -u -p -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml ---- org.glite.deployment/project/glite.deployment.csf.xml 18 Apr 2006 15:42:14 -0000 1.44.2.1.2.11.2.24 -+++ org.glite.deployment/project/glite.deployment.csf.xml 1 Sep 2006 14:23:09 -0000 -@@ -667,6 +667,14 @@ +retrieving revision 1.46 +diff -u -r1.46 glite.deployment.csf.xml +--- org.glite.deployment/project/glite.deployment.csf.xml 31 Jul 2006 09:53:53 -0000 1.46 ++++ org.glite.deployment/project/glite.deployment.csf.xml 20 Apr 2007 09:06:21 -0000 +@@ -392,6 +392,14 @@ @@ -126,7 +124,7 @@ diff -u -p -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml -@@ -1571,6 +1579,28 @@ +@@ -835,6 +843,28 @@ tag="${org.glite.deployment.lb.version}" /> @@ -155,7 +153,7 @@ diff -u -p -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml -@@ -1667,6 +1697,8 @@ +@@ -892,6 +922,8 @@ wn, wms, lb, @@ -167,17 +165,14 @@ diff -u -p -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml Index: org.glite.deployment.lb/config/scripts/glite-lb-config.py =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/scripts/glite-lb-config.py,v -retrieving revision 1.65.2.4 -diff -u -p -u -r1.65.2.4 glite-lb-config.py ---- org.glite.deployment.lb/config/scripts/glite-lb-config.py 26 May 2006 12:24:22 -0000 1.65.2.4 -+++ org.glite.deployment.lb/config/scripts/glite-lb-config.py 1 Sep 2006 14:23:10 -0000 -@@ -129,7 +129,12 @@ python %s-config [OPTION...]""" % (self. - - if not os.path.exists('/tmp/mysql.sock'): - os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock') -- -+ -+ +retrieving revision 1.66 +diff -u -r1.66 glite-lb-config.py +--- org.glite.deployment.lb/config/scripts/glite-lb-config.py 13 Mar 2006 15:22:31 -0000 1.66 ++++ org.glite.deployment.lb/config/scripts/glite-lb-config.py 20 Apr 2007 09:06:21 -0000 +@@ -121,6 +121,10 @@ + if not os.path.exists('/tmp/mysql.sock'): + os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock') + + #------------------------------------------------------------------- + # start bkserver + #------------------------------------------------------------------- @@ -185,7 +180,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py pid = glib.getPID('bkserverd') if pid != 0: print 'The gLite LB Server service is already running. Restarting...' -@@ -142,7 +147,7 @@ python %s-config [OPTION...]""" % (self. +@@ -133,7 +137,7 @@ pid = glib.getPID('bkserverd') if (pid != 0): @@ -194,7 +189,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py glib.printOkMessage() else: glib.printErrorMessage("Could not start the gLite LB Server service") -@@ -151,6 +156,36 @@ python %s-config [OPTION...]""" % (self. +@@ -142,6 +146,36 @@ return 1 #------------------------------------------------------------------- @@ -231,7 +226,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py # Start Servicetool #------------------------------------------------------------------- -@@ -170,6 +205,10 @@ python %s-config [OPTION...]""" % (self. +@@ -161,6 +195,10 @@ if (pid != 0): os.system('%s/etc/init.d/glite-lb-bkserverd stop' % os.environ['GLITE_LOCATION']) @@ -242,7 +237,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py pid = glib.getPID('bkserverd') if (pid != 0): print 'Could not stop the LB Server service ', -@@ -180,6 +219,25 @@ python %s-config [OPTION...]""" % (self. +@@ -171,6 +209,25 @@ glib.printOkMessage() #------------------------------------------------------------------- @@ -268,7 +263,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py # MySQL #------------------------------------------------------------------- -@@ -204,6 +262,10 @@ python %s-config [OPTION...]""" % (self. +@@ -195,6 +252,10 @@ if retval != 0: error_level = 1 @@ -279,7 +274,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py #------------------------------------------------------------------- # Servicetool #------------------------------------------------------------------- -@@ -334,7 +396,29 @@ python %s-config [OPTION...]""" % (self. +@@ -325,7 +386,29 @@ print "\n==> MySQL database %s already exist\n" % params['lb.database.name'] self.mysql.stop() @@ -301,7 +296,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py + file.write('00,30 * * * * %s %s/etc/glite-lb-export-cron-wrapper.sh 1>/dev/null\n' % (params['glite.user.name'], os.environ['GLITE_LOCATION'])) + file.close() + os.system('/bin/chmod 0644 /etc/cron.d/glite-lb-export.cron') -+ else ++ else: + os.system('/bin/rm -f /etc/cron.d/glite-lb-export.cron') + + # Touch cron spool directory to cause reloading of the crontabs @@ -310,7 +305,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py #------------------------------------------------------------------- # RGMA servicetool: configure servicetool #------------------------------------------------------------------- -@@ -420,6 +504,19 @@ def set_env(): +@@ -411,6 +494,19 @@ # Perl glib.addEnvPath("PERL5LIB", "%s/lib/perl:%s/lib/perl5" % (os.environ['GPT_LOCATION'],os.environ['GLITE_LOCATION'])) @@ -334,9 +329,9 @@ Index: org.glite.deployment.lb/config/templates/glite-lb.cfg.xml =================================================================== RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml,v retrieving revision 1.21 -diff -u -p -u -r1.21 glite-lb.cfg.xml +diff -u -r1.21 glite-lb.cfg.xml --- org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 13 Mar 2006 15:19:21 -0000 1.21 -+++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 1 Sep 2006 14:23:10 -0000 ++++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 20 Apr 2007 09:06:21 -0000 @@ -17,9 +17,16 @@ parameter. Leave it empty of comment it out to use the same as 'glite.user.name'" value="changeme"/> @@ -370,7 +365,7 @@ diff -u -p -u -r1.21 glite-lb.cfg.xml -@@ -67,7 +80,47 @@ +@@ -67,7 +80,52 @@ destination @@ -387,10 +382,15 @@ diff -u -p -u -r1.21 glite-lb.cfg.xml + value="/tmp/jpdump"/> + + + ++ ++ + + +- @@ -452,3 +461,30 @@ diff -u -p -u -r1.38.2.2 glite-lb.sdf.xml.template + +- ++ + + + ++%attr(644,root,root) %{prefix}/share/doc/glite-lb/release_notes/release_notes.doc\n ++%attr(644,root,root) %{prefix}/share/doc/glite-lb/release_notes/release_notes.pdf\n ++%attr(644,root,root) %{prefix}/share/doc/glite-lb/release_notes/release_notes.html\n"/> + + + -- 1.8.2.3