From 1583edfe7a73413eec72b770f65876feb352ea8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Fri, 21 Jul 2006 12:01:45 +0000 Subject: [PATCH] - new all-in-one JP deploy patch against: org.glite glite_branch_3_0_2_RC4 org.glite.deployment glite-deployment_R_2_4_3 org.glite.deployment.lb glite-deployment-lb_R_2_2_4 org.glite.security glite-security_R_3_0_21 --- org.glite.lb/deployment/deploy_all.diff | 473 ++++++++++++++++++++++++++++++++ 1 file changed, 473 insertions(+) create mode 100644 org.glite.lb/deployment/deploy_all.diff diff --git a/org.glite.lb/deployment/deploy_all.diff b/org.glite.lb/deployment/deploy_all.diff new file mode 100644 index 0000000..7fb7b80 --- /dev/null +++ b/org.glite.lb/deployment/deploy_all.diff @@ -0,0 +1,473 @@ +Index: org.glite/project/global.dependencies.properties +=================================================================== +RCS file: /cvs/jra1mw/org.glite/project/global.dependencies.properties,v +retrieving revision 1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 +diff -u -r1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 global.dependencies.properties +--- org.glite/project/global.dependencies.properties 14 Jul 2006 14:29:45 -0000 1.479.2.77.2.4.2.1.4.2.2.6.2.1.2.4 ++++ org.glite/project/global.dependencies.properties 21 Jul 2006 09:57:26 -0000 +@@ -1617,7 +1617,26 @@ + ext.globus-sdk.rpm.name = vdt_globus_sdk + ext.globus-sdk.rpm.version = ${ext.vdt.version} + ext.globus-sdk.rpm.age = 1 +- ++ ++# 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 ++ ++ + # GPT + ext.gpt.name = gpt + ext.gpt.vendor = gpt +@@ -3338,7 +3357,7 @@ + org.glite.dgas.version = glite-dgas_R_1_1_16 + org.glite.gpbox.version = glite-gpbox_R_1_0_15 + org.glite.jdl.version = glite-jdl_R_1_0_0 +-org.glite.jp.version = glite-jp_R_1_1_3 ++org.glite.jp.version = glite-jp_R_1_3_0 + org.glite.lb.version = glite-lb_R_1_2_11 + org.glite.rgma.version = glite-rgma_R_5_0_43 + org.glite.security.version = glite-security_R_3_0_21 +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 -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 21 Jul 2006 09:57:26 -0000 +@@ -1619,6 +1619,39 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1730,6 +1763,8 @@ + wn, + wms, + lb, ++ jpps, ++ jpis, + io-server, + io-client, + ce, +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.118 +diff -u -r1.526.2.5.2.127.2.415.2.118 dependencies.properties +--- org.glite.deployment/project/dependencies.properties 27 Jun 2006 10:35:43 -0000 1.526.2.5.2.127.2.415.2.118 ++++ org.glite.deployment/project/dependencies.properties 21 Jul 2006 09:57:26 -0000 +@@ -80,6 +80,10 @@ + + org.glite.deployment.lb.version = glite-deployment-lb_R_2_2_4 + ++ org.glite.deployment.jpis.version = HEAD ++ ++ org.glite.deployment.jpps.version = HEAD ++ + org.glite.deployment.glite-WMSLB.version = glite-deployment-glite-WMSLB_R_2_4_2 + + org.glite.deployment.wn.version = glite-deployment-wn_R_2_3_8 +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 -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 21 Jul 2006 09:57:26 -0000 +@@ -667,6 +667,14 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1571,6 +1579,28 @@ + tag="${org.glite.deployment.lb.version}" /> + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -1667,6 +1697,8 @@ + wn, + wms, + lb, ++ jpis, ++ jpps, + io-server, + io-client, + ce" /> +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 -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 21 Jul 2006 09:57:26 -0000 +@@ -129,7 +129,12 @@ + + if not os.path.exists('/tmp/mysql.sock'): + os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock') +- ++ ++ ++ #------------------------------------------------------------------- ++ # start bkserver ++ #------------------------------------------------------------------- ++ + pid = glib.getPID('bkserverd') + if pid != 0: + print 'The gLite LB Server service is already running. Restarting...' +@@ -142,7 +147,7 @@ + pid = glib.getPID('bkserverd') + + if (pid != 0): +- print "The gLite LB Server service has been started ", ++ print "The gLite LB Server service has been started ", + glib.printOkMessage() + else: + glib.printErrorMessage("Could not start the gLite LB Server service") +@@ -151,6 +156,36 @@ + return 1 + + #------------------------------------------------------------------- ++ # start jp-importer, if enabled ++ #------------------------------------------------------------------- ++ ++ lb_export = 0 ++ if params.has_key('lb.export.enabled'): ++ if params['lb.export.enabled'] == "true": ++ lb_export = 1 ++ ++ if lb_export: ++ pid = glib.getPID('jp-importer') ++ if pid != 0: ++ print 'The gLite JP Importer service is already running. Restarting...' ++ os.system('%s/etc/init.d/glite-jp-importer stop' % os.environ['GLITE_LOCATION']) ++ else: ++ print 'Starting the gLite JP Importer service...' ++ ++ os.system('%s/etc/init.d/glite-jp-importer start' % os.environ['GLITE_LOCATION']) ++ ++ pid = glib.getPID('jp-importer') ++ ++ if (pid != 0): ++ print "The gLite JP Importer service has been started ", ++ glib.printOkMessage() ++ else: ++ glib.printErrorMessage("Could not start the gLite JP Importer service") ++ glib.printErrorMessage("Please verify and re-run the script "), ++ glib.printFailedMessage() ++ return 1 ++ ++ #------------------------------------------------------------------- + # Start Servicetool + #------------------------------------------------------------------- + +@@ -170,6 +205,10 @@ + if (pid != 0): + os.system('%s/etc/init.d/glite-lb-bkserverd stop' % os.environ['GLITE_LOCATION']) + ++ #------------------------------------------------------------------- ++ # Book Keeping Server ++ #------------------------------------------------------------------- ++ + pid = glib.getPID('bkserverd') + if (pid != 0): + print 'Could not stop the LB Server service ', +@@ -180,6 +219,25 @@ + glib.printOkMessage() + + #------------------------------------------------------------------- ++ # JP Importer ++ #------------------------------------------------------------------- ++ ++ pid = glib.getPID('jp-importer') ++ if (pid != 0): ++ os.system('%s/etc/init.d/glite-jp-importer stop' % os.environ['GLITE_LOCATION']) ++ ++ pid = glib.getPID('jp-importer') ++ if (pid != 0): ++ print 'Could not stop the JP Importer service ', ++ glib.printFailedMessage() ++ error_level = 1 ++ else: ++ if params.has_key('lb.export.enabled'): ++ if params['lb.export.enabled'] == "true": ++ print 'The JP Importer service has been stopped ', ++ glib.printOkMessage() ++ ++ #------------------------------------------------------------------- + # MySQL + #------------------------------------------------------------------- + +@@ -204,6 +262,10 @@ + if retval != 0: + error_level = 1 + ++ retval = os.system('%s/etc/init.d/glite-jp-importer status' % os.environ['GLITE_LOCATION']) ++ if retval != 0: ++ error_level = 1 ++ + #------------------------------------------------------------------- + # Servicetool + #------------------------------------------------------------------- +@@ -334,7 +396,27 @@ + print "\n==> MySQL database %s already exist\n" % params['lb.database.name'] + + self.mysql.stop() +- ++ ++ # ------------------------------------------------------------------ ++ # export from bkserver to cron ++ # ------------------------------------------------------------------ ++ if params['GLITE_LB_EXPORT_ENABLED'] == "true": ++ file = open('%s/etc/glite-lb-export-cron-wrapper.sh' % os.environ['GLITE_LOCATION'], 'w') ++ file.write('#! /bin/sh\n') ++ file.write('. %s\n' % glib.getInstallerExportFile()) ++ file.write('$GLITE_LOCATION/examples/glite-lb-export.sh\n') ++ file.close() ++ os.system('/bin/chmod 0755 %s/etc/glite-lb-export-cron-wrapper.sh' % os.environ['GLITE_LOCATION']) ++ ++ file = open('/etc/cron.d/glite-lb-export.cron', 'w') ++ file.write('# periodically run purge and export jobs from bkserver\n') ++ file.write('00,30 * * * * %s %s/etc/glite-lb-export-cron-wrapper.sh\n' % (params['glite.user.name'], os.environ['GLITE_LOCATION'])) ++ file.close() ++ os.system('/bin/chmod 0755 /etc/cron.d/glite-lb-export.cron') ++ ++ # Touch cron spool directory to cause reloading of the crontabs ++ os.system("/bin/touch /var/spool/cron") ++ + #------------------------------------------------------------------- + # RGMA servicetool: configure servicetool + #------------------------------------------------------------------- +@@ -420,6 +502,17 @@ + # Perl + glib.addEnvPath("PERL5LIB", "%s/lib/perl:%s/lib/perl5" % (os.environ['GPT_LOCATION'],os.environ['GLITE_LOCATION'])) + ++ # LB export ++ glib.export('GLITE_LB_EXPORT_ENABLED', params['lb.export.enabled']); ++ glib.export('GLITE_LB_EXPORT_BKSERVER', params['lb.export.bkserver']); ++ glib.export('GLITE_LB_EXPORT_JPPS', params['lb.export.jpps']); ++ glib.export('GLITE_LB_EXPORT_JPREG_MAILDIR', params['lb.export.jpreg']); ++ glib.export('GLITE_LB_EXPORT_JPDUMP_MAILDIR', params['lb.export.jpdump']); ++ glib.export('GLITE_LB_EXPORT_DUMPDIR', params['lb.export.dump']); ++ glib.export('GLITE_LB_EXPORT_DUMPDIR_OLD', params['lb.export.dump.old']); ++ glib.export('GLITE_LB_EXPORT_EXPORTDIR', params['lb.export.export']); ++ glib.export('GLITE_LB_EXPORT_PURGE_ARGS', '"%s"' % params['lb.export.purgeargs']); ++ + # Set environment + glib.setUserEnv() + +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 -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 21 Jul 2006 09:57:26 -0000 +@@ -17,9 +17,16 @@ + parameter. Leave it empty of comment it out to use the same as 'glite.user.name'" + value="changeme"/> + +- ++ ++ ++ ++ ++ + + + +@@ -55,6 +62,12 @@ + [Example: 17M][Type: Integer][Unit: MB]" + value="17M"/> + ++ ++ ++ + + + +@@ -67,7 +80,42 @@ + destination + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +Index: org.glite.deployment.lb/project/glite-lb.sdf.xml.template +=================================================================== +RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/glite-lb.sdf.xml.template,v +retrieving revision 1.38.2.2 +diff -u -r1.38.2.2 glite-lb.sdf.xml.template +--- org.glite.deployment.lb/project/glite-lb.sdf.xml.template 2 May 2006 10:36:19 -0000 1.38.2.2 ++++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template 21 Jul 2006 09:57:26 -0000 +@@ -57,6 +57,12 @@ + build="@org.glite.lb.server-bones.info.build@" + arch="i386"/> + ++ ++ + + ++ ++ +