Merge branch 'erp5' into deployment_generic_CR1094

Conflicts:
	software/erp5/software.cfg

component/imagemagick/buildout.cfg

@@ -27,8 +27,8 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-10.tar.bz2
-md5sum = 3c1d1a04b1ed2998217e16001b58069f
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.4-10.tar.bz2
+md5sum = b44464c9d79dc8fe9d253fc0a9d52470
 configure-options =
   --disable-static
   --without-x

component/java/buildout.cfg

@@ -29,8 +29,8 @@ slapos_promisee =
   directory:javaws
   file:lib/rt.jar
   file:bin/java
-x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=52240 0bd27d325c5ce11ce863d982ad052f7f
-x86-64 =  http://javadl.sun.com/webapps/download/AutoDL?BundleId=52242 a4d929bc4d6511290c07c3745477b77b
+x86 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-i586.bin 3e80243483bc825c34ae01a4373cce5f
+x86-64 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-x64.bin a4d28c49251d6b9c2d300b3d61f1ce95
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   download_file = self.download(self.options['url'], self.options.get('md5sum'))
@@ -43,7 +43,7 @@ script =
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)
-  self.copyTree(os.path.join(workdir, "jre1.6.0_27"), "%(location)s")
+  self.copyTree(os.path.join(workdir, "jre1.6.0_30"), "%(location)s")
 
 [java-sdk-1.6.0]
 recipe = slapos.recipe.build

component/percona-toolkit/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-url = http://www.percona.com/redir/downloads/percona-toolkit/percona-toolkit-2.0.1.tar.gz
-md5sum = 3a78c78672cb7c634bda35dfb2f817bf
+url = http://www.percona.com/redir/downloads/percona-toolkit/2.0.2/percona-toolkit-2.0.2.tar.gz
+md5sum = 74f55df529b2527853d4d907f0175c0d
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz
-md5sum = dce303524736fe89a76b8ed29d566352
+url = http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz
+md5sum = 9ed2ca93577b58cfa0d01f64b9312ab9
 configure-options =
   --disable-static
   --enable-readline

slapos/recipe/apache_zope_backend/template/snippet.ssl.in

@@ -6,6 +6,7 @@ SSLCertificateKeyFile %(key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 SSLProtocol -ALL +SSLv3 +TLSv1
-SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
+SSLHonorCipherOrder On
+SSLCipherSuite RC4-SHA:HIGH:!ADH
 
 SSLProxyEngine On

slapos/recipe/simplelogger.py

@@ -24,31 +24,25 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import shutil
-import os
 import sys
 import time
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 def log(args):
-  directory, suffix = args
-  filename = time.strftime('%Y-%m-%d.%H:%M.%s') + suffix
-  with open(os.path.join(directory, filename), 'aw') as logfile:
-    shutil.copyfileobj(sys.stdin, logfile)
+  prefix = time.strftime('%Y-%m-%d.%H:%M.%s:')
+  with open(args['filename'], 'aw') as logfile:
+    for line in sys.stdin:
+      print >> logfile, prefix, line,
+    print >> logfile, prefix, '------------------------'
 
 class Recipe(GenericBaseRecipe):
 
   def install(self):
-    self.logger.info("Simple logger installation")
-    binary = self.options['binary']
-    output = self.options['output']
-    suffix = self.options.get('suffix', '.log')
-
-    script = self.createPythonScript(binary,
-                                     'slapos.recipe.simplelogger.log',
-                                     arguments=[output, suffix])
-    self.logger.debug("Logger script created at : %r", script)
-    self.logger.info("Simple logger installed.")
+    wrapper = self.options['wrapper']
+    log = self.options['log']
 
+    script = self.createPythonScript(wrapper,
+                                     __name__ + '.log',
+                                     arguments=dict(filename=log))
     return [script]

software/erp5/instance-kumofs.cfg

@@ -78,7 +78,6 @@ recipe = slapos.cookbook:mkdirectory
 cron-entries = $${rootdirectory:etc}/cron.d
 crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
-cronoutput = $${basedirectory:log}/cron
 logrotate-backup = $${basedirectory:backup}/logrotate
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
 kumofs-data = $${rootdirectory:srv}/kumofs
@@ -101,8 +100,8 @@ binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/cron.log
 
 [cron-entry-logrotate]
 <= cron

software/erp5/instance-mariadb.cfg

@@ -151,8 +151,8 @@ binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/cron.log
 
 [cron-entry-logrotate]
 <= cron
@@ -195,7 +195,6 @@ recipe = slapos.cookbook:mkdirectory
 cron-entries = $${rootdirectory:etc}/cron.d
 crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
-cronoutput = $${basedirectory:log}/cron
 ca-dir = $${rootdirectory:srv}/ssl
 mariadb-backup = $${basedirectory:backup}/mariadb
 mariadb-backup-full = $${basedirectory:backup}/mariadb-full

software/erp5/instance-zope.cfg

@@ -139,8 +139,8 @@ binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/cron.log
 
 [cron-entry-logrotate]
 <= cron
@@ -262,6 +262,5 @@ ca-dir = $${rootdirectory:srv}/ssl
 cron-entries = $${rootdirectory:etc}/cron.d
 crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
-cronoutput = $${basedirectory:log}/cron
 logrotate-backup = $${basedirectory:backup}/logrotate
 logrotate-entries = $${rootdirectory:etc}/logrotate.d

software/erp5/snippet-master.cfg

@@ -63,7 +63,6 @@ recipe = slapos.cookbook:mkdirectory
 cron-entries = $${rootdirectory:etc}/cron.d
 crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
-cronoutput = $${basedirectory:log}/cron
 logrotate-backup = $${basedirectory:backup}/logrotate
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
 
@@ -78,8 +77,8 @@ binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/cron.log
 
 [cron-entry-logrotate]
 <= cron
@@ -184,7 +183,6 @@ ca-dir = $${rootdirectory:srv}/ssl
 cron-entries = $${rootdirectory:etc}/cron.d
 crontabs = $${rootdirectory:etc}/crontabs
 cronstamps = $${rootdirectory:etc}/cronstamps
-cronoutput = $${basedirectory:log}/cron
 logrotate-backup = $${basedirectory:backup}/logrotate
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
 

software/erp5/software.cfg

@@ -62,7 +62,7 @@ command = grep parts ${buildout:develop-eggs-directory}/z2loganalyser.egg-link
 [template-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = fa68fcc416d6d2b4d53988c7f5b1be10
+md5sum = cd8530c7154d4bd24279327fdbfdf5ec
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
@@ -76,7 +76,7 @@ mode = 0644
 [template-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = 7918697edc5620694ba3433572d9b88d
+md5sum = d814e4defef7670ca11fb150a3b207fa
 output = ${buildout:directory}/template-zope.cfg
 mode = 0644
 
@@ -97,7 +97,7 @@ mode = 0644
 [template-kumofs]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kumofs.cfg
-md5sum = 333c6001da9a19390cbb6a154649378c
+md5sum = 27780a87f7cf7ee569f3e853c988fcfe
 output = ${buildout:directory}/template-kumofs.cfg
 mode = 0644
 
@@ -139,7 +139,7 @@ mode = 0644
 [template-snippet-master]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-master.cfg
-md5sum = 4d984d767e30dd7b8a333d35eca03eb7
+md5sum = 8cb0c06453b30524a201d220264cee11
 output = ${buildout:directory}/template-snippet-master.cfg
 mode = 0644
 

stack/erp5.cfg

@@ -164,7 +164,7 @@ recipe = plone.recipe.command
 stop-on-error = true
 genbt5list = ${erp5:location}/product/ERP5/bin/genbt5list
 command =
-  ${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
+  ls -ld ${local-bt5-repository:list} ; ${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
 update-command = ${:command}
 
 [bootstrap2.6]
@@ -246,7 +246,8 @@ repository = http://git.erp5.org/repos/erp5.git
 branch = master
 revision =
 command = ${git:location}/bin/git clone --quiet --branch ${:branch} ${:repository} ${:location} && if [ -n "${:revision}" ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n "${:revision}" ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+# ls information added in order to debug .git disappearing
+update-command = ls -la ${:location} ; ls -ld ${:location}/product/ERP5/bootstrap ; cd ${:location} && ${git:location}/bin/git pull && if [ -n "${:revision}" ]; then echo "Resetting." ; cd ${:location} && ${git:location}/bin/git reset --hard ${:revision} ; fi
 
 [beteireflow-repository]
 <= erp5