From 7bcabf2460551e322d51ebd58e218ea4cd8c2fa9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 1 Sep 2006 14:26:23 +0000 Subject: [PATCH] Added the purge dir yet, the dump dir needs to be cleaned. --- org.glite.lb/deployment/deploy_all.diff | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/org.glite.lb/deployment/deploy_all.diff b/org.glite.lb/deployment/deploy_all.diff index b685d73..fe177ce 100644 --- a/org.glite.lb/deployment/deploy_all.diff +++ b/org.glite.lb/deployment/deploy_all.diff @@ -4,7 +4,7 @@ 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:13:27 -0000 ++++ org.glite/project/global.dependencies.properties 1 Sep 2006 14:23:09 -0000 @@ -1819,7 +1819,25 @@ ext.globus-sdk.description = The Globus ext.globus-sdk.rpm.name = vdt_globus_sdk ext.globus-sdk.rpm.version = ${ext.vdt.version} @@ -38,7 +38,7 @@ 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:13:27 -0000 ++++ org.glite.deployment/build.xml 1 Sep 2006 14:23:09 -0000 @@ -1619,6 +1619,39 @@ @@ -94,7 +94,7 @@ 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:13:27 -0000 ++++ 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 @@ -110,7 +110,7 @@ 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:13:28 -0000 ++++ org.glite.deployment/project/glite.deployment.csf.xml 1 Sep 2006 14:23:09 -0000 @@ -667,6 +667,14 @@ @@ -170,7 +170,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/scripts/glite-lb-config.py, 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:13:34 -0000 ++++ 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'): @@ -310,7 +310,7 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py #------------------------------------------------------------------- # RGMA servicetool: configure servicetool #------------------------------------------------------------------- -@@ -420,6 +504,17 @@ def set_env(): +@@ -420,6 +504,19 @@ def set_env(): # Perl glib.addEnvPath("PERL5LIB", "%s/lib/perl:%s/lib/perl5" % (os.environ['GPT_LOCATION'],os.environ['GLITE_LOCATION'])) @@ -323,6 +323,8 @@ diff -u -p -u -r1.65.2.4 glite-lb-config.py + glib.export('GLITE_LB_EXPORT_DUMPDIR_KEEP', params['lb.export.dump.keep']); + glib.export('GLITE_LB_EXPORT_JOBSDIR', params['lb.export.jobs']); + glib.export('GLITE_LB_EXPORT_JOBSDIR_KEEP', params['lb.export.jobs.keep']); ++ glib.export('GLITE_LB_EXPORT_PURGEDIR', params['lb.export.purge']); ++ glib.export('GLITE_LB_EXPORT_PURGEDIR_KEEP', params['lb.export.purge.keep']); + glib.export('GLITE_LB_EXPORT_PURGE_ARGS', '%s' % params['lb.export.purgeargs']); + # Set environment @@ -334,7 +336,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml, retrieving revision 1.21 diff -u -p -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:13:34 -0000 ++++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml 1 Sep 2006 14:23:10 -0000 @@ -17,9 +17,16 @@ parameter. Leave it empty of comment it out to use the same as 'glite.user.name'" value="changeme"/> @@ -423,7 +425,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/glite-lb.sdf.xml.template, retrieving revision 1.38.2.2 diff -u -p -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 1 Sep 2006 14:13:34 -0000 ++++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template 1 Sep 2006 14:23:10 -0000 @@ -57,6 +57,12 @@ build="@org.glite.lb.server-bones.info.build@" arch="i386"/> -- 1.8.2.3