Merge remote-tracking branch 'origin/erp5'

component/gcc/buildout.cfg

@@ -170,4 +170,4 @@ make-targets = install -j1
 # until gcc will be simplified by using more robust build recipe (like
 # slapos.recipe.build) each time any of parts which reuses this one gets updated
 # the hack-revision have to be increased
-hack-revision = 1
+hack-revision = 2

component/ghostscript/buildout.cfg

@@ -29,5 +29,5 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2
-md5sum = 8bcef1f33ddf8a4d12b2cf8da385c191
+url = http://downloads.ghostscript.com/public/ghostscript-9.06.tar.bz2
+md5sum = 46f9ebe40dc52755287b30704270db11

component/groonga/buildout.cfg

@@ -7,12 +7,12 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.5.tar.gz
-md5sum = 6ea6634ceee97f701add89ee39f4c1da
+url = http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz
+md5sum = 64467d1ab8d5e0df8348a636972a95a7
 configure-options =
   --disable-static
   --disable-glibtest
   --disable-benchmark
   --disable-document
-  --disable-nginx
+  --disable-groonga-httpd
   --without-mecab

component/haproxy/buildout.cfg

@@ -9,8 +9,8 @@ parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.21.tar.gz
-md5sum = f36d5d13fd4a44ab454eee5d06cb38a2
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz
+md5sum = a0b007c76f6a78524f3b3dd5e704979c
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/java/buildout.cfg

@@ -29,9 +29,9 @@ slapos_promisee =
   directory:javaws
   file:lib/rt.jar
   file:bin/java
-# http://java.com/en/download/manual.jsp?locale=en
-x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59621 7466b0b86bef21e3e31ae578b2b9f472
-x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59623 c5cfb8393d257b51e7a70e56b7784ac9
+# http://java.com/en/download/manual_v6.jsp
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68284 7eda40e790de1a907d591b62949b6e72
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68286 839548714931443ba89719a995ece846
 script =
   import glob
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -47,48 +47,20 @@ script =
   workdir = guessworkdir(extract_dir)
   self.copyTree(glob.glob(os.path.join(workdir, "jre1.6.0_*"))[0], "%(location)s")
 
-[java-sdk-1.6.0]
+[java-re-1.7.0]
 recipe = slapos.recipe.build
 slapos_promisee =
   directory:bin
   directory:lib
   directory:man
   directory:plugin
-  directory:javaws
-  file:jre/lib/rt.jar
-  file:bin/java
-x86 = http://download.oracle.com/otn-pub/java/jdk/6u27-b07/jdk-6u27-linux-i586.bin bdb5f05bd20c6aa9a4729726191bf6fd
-x86-64 = http://download.oracle.com/otn-pub/java/jdk/6u27-b07/jdk-6u27-linux-x64.bin 94f93a3ff03f824a238ecd79ad90433e
-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'))
-  extract_dir = tempfile.mkdtemp(self.name)
-  os.chdir(extract_dir)
-  (download_dir, filename) = os.path.split(download_file)
-  auto_extract_bin = os.path.join(extract_dir, filename)
-  shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0777)
-  subprocess.call(["patch", auto_extract_bin, "-i", "${jdk-6u27-no-user-interaction-patch:location}/${jdk-6u27-no-user-interaction-patch:filename}"])
-  subprocess.call([auto_extract_bin])
-  self.cleanup_dir_list.append(extract_dir)
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(os.path.join(workdir, "jdk1.6.0_27"), "%(location)s")
-
-[java-sdk-1.7.0]
-recipe = slapos.recipe.build
-slapos_promisee =
-  directory:bin
-  directory:lib
-  directory:man
-  directory:jre
-  file:jre/lib/rt.jar
+  file:lib/rt.jar
   file:bin/java
-  file:bin/javac
-x86 = http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-i586.tar.gz f97244a104f03731e5ff69f0dd5a9927
-x86-64 = http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-x64.tar.gz b3c1ef5faea7b180469c129a49762b64
+# http://java.com/en/download/manual.jsp?locale=en
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68234 ea99bedd9db33e9e2970f4b70abd1e4b
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68236 5aa9bd26cdf1fa6afd2b15826b4ba139
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum')))
   workdir = guessworkdir(extract_dir)
   self.copyTree(workdir, "%(location)s")
-

component/mariadb/buildout.cfg

@@ -59,9 +59,11 @@ environment =
   LDFLAGS=-L${libaio:location}/lib
 
 [mroonga-mariadb]
+# mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
+# http://mroonga.github.com/
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.05.tar.gz
-md5sum = 6aee0e6ff948bba7c02854326afc11df
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.06.tar.gz
+md5sum = 89ce640a57ed8f2161b8358ff4c29c66
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

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/2.0.4/percona-toolkit-2.0.4.tar.gz
-md5sum = df7dffcccb48d50f143849629228d4b4
+url = http://www.percona.com/redir/downloads/percona-toolkit/2.1.3/percona-toolkit-2.1.3.tar.gz
+md5sum = 6f8c4a0a0e43e467766cbdabaec9ef93
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/poppler/buildout.cfg

@@ -13,8 +13,8 @@ extends =
 
 [poppler]
 recipe = hexagonit.recipe.cmmi
-md5sum = 45dd2c16c8c4d1a39e830e45745c4e25
-url = http://poppler.freedesktop.org/poppler-0.20.2.tar.gz
+md5sum = 28c40266f374e1960a7bcead17d39f96
+url = http://poppler.freedesktop.org/poppler-0.20.3.tar.gz
 depends =
   ${libtiff:version}
 configure-options =

component/sphinx/README

+This component is not used anymore - but might be revived within 4 months.
+If not used within 6 months, feel free to delete this.

component/sphinx/buildout.cfg

@@ -20,8 +20,8 @@ filename = sphinx-1.10-beta-snowball.patch
 recipe = hexagonit.recipe.cmmi
 depends =
   ${mariadb:version}
-url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
-md5sum = fafe0f1a71d0ded32404c067eba7d0b3
+url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz
+md5sum = e71fdb5b0c2911247d48fb30550b9584
 configure-options =
   --with-mysql
   --with-mysql-includes=${mariadb:location}/include/mysql

setup.py

@@ -36,6 +36,7 @@ setup(name=name,
         'xml_marshaller', # need to communication with slapgrid
         'zc.buildout', # plays with buildout
         'zc.recipe.egg', # for scripts generation
+        'pytz', # for timezone database
         ],
       zip_safe=True,
       entry_points={

slapos/recipe/generic_mysql/__init__.py

@@ -154,26 +154,38 @@ class Recipe(GenericBaseRecipe):
     # TODO: move to a separate recipe (ack'ed by Cedric)
     # percona toolkit (formerly known as maatkit) installation
     for pt_script_name in (
+        'pt-align',
         'pt-archiver',
+        'pt-collect',
         'pt-config-diff',
         'pt-deadlock-logger',
+        'pt-diskstats',
         'pt-duplicate-key-checker',
         'pt-fifo-split',
         'pt-find',
+        'pt-fingerprint',
         'pt-fk-error-logger',
         'pt-heartbeat',
         'pt-index-usage',
+        'pt-ioprofile',
         'pt-kill',
         'pt-log-player',
+        'pt-mext',
+        'pt-mysql-summary',
         'pt-online-schema-change',
+        'pt-pmp',
         'pt-query-advisor',
         'pt-query-digest',
         'pt-show-grants',
+        'pt-sift',
         'pt-slave-delay',
         'pt-slave-find',
         'pt-slave-restart',
+        'pt-stalk',
+        'pt-summary',
         'pt-table-checksum',
         'pt-table-sync',
+        'pt-table-usage',
         'pt-tcp-model',
         'pt-trend',
         'pt-upgrade',

slapos/recipe/generic_mysql/mysql.py

@@ -2,6 +2,7 @@ import os
 import subprocess
 import time
 import sys
+import pytz
 
 
 def runMysql(args):
@@ -41,7 +42,6 @@ def updateMysql(args):
   sleep = 30
   is_succeed = False
   while True:
-    if not is_succeed:
     mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
     mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     result = mysql_upgrade.communicate()[0]
@@ -49,7 +49,6 @@ def updateMysql(args):
       mysql_upgrade.kill()
     if mysql_upgrade.returncode != 0 and not 'is already upgraded' in result:
       print "Command %r failed with result:\n%s" % (mysql_upgrade_list, result)
-        print 'Sleeping for %ss and retrying' % sleep
     else:
       if mysql_upgrade.returncode == 0:
         print "MySQL database upgraded with result:\n%s" % result
@@ -63,10 +62,30 @@ def updateMysql(args):
         mysql.kill()
       if mysql.returncode != 0:
         print 'Command %r failed with:\n%s' % (mysql_list, result)
-          print 'Sleeping for %ss and retrying' % sleep
       else:
+        # import timezone database
+        mysql_tzinfo_to_sql_binary = os.path.join(
+          os.path.dirname(conf['mysql_binary'].strip()), 'mysql_tzinfo_to_sql')
+        zoneinfo_directory = '%s/zoneinfo' % os.path.dirname(pytz.__file__)
+        mysql_tzinfo_to_sql_list = [mysql_tzinfo_to_sql_binary, zoneinfo_directory]
+        mysql_tzinfo_to_sql = subprocess.Popen(mysql_tzinfo_to_sql_list, stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        timezone_sql = mysql_tzinfo_to_sql.communicate()[0]
+        if mysql.returncode != 0:
+          print 'Command %r failed with:\n%s' % (mysql_tzinfo_to_sql_list, result)
+        else:
+          mysql = subprocess.Popen(mysql_list + ['mysql',], stdin=subprocess.PIPE,
+                                   stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+          result = mysql.communicate(timezone_sql)[0]
+          if mysql.returncode is None:
+            mysql.kill()
+          if mysql.returncode != 0:
+            print 'Command %r failed with:\n%s' % (mysql_list, result)
           is_succeed = True
+    if is_succeed:
       print 'SlapOS initialisation script succesfully applied on database.'
+      break
+    print 'Sleeping for %ss and retrying' % sleep
     sys.stdout.flush()
     sys.stderr.flush()
     time.sleep(sleep)

slapos/recipe/generic_mysql/template/my.cnf.in

@@ -24,7 +24,7 @@ long_query_time = 1
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so;handlersocket.so
+plugin-load = ha_mroonga.so;handlersocket.so
 
 # By default only 100 connections are allowed, when using zeo
 # we may have much more connections

slapos/recipe/haproxy/__init__.py

@@ -73,7 +73,11 @@ class Recipe(GenericBaseRecipe):
     server_snippet = ""
     i = 0
     name = self.options['name']
-    for address in self.options['backend-list'].split():
+    backend_list = self.options['backend-list']
+    if isinstance(backend_list, str):
+      # BBB
+      backend_list = backend_list.split()
+    for address in backend_list:
       i += 1
       server_snippet += self.substituteTemplate(
           snippet_filename, dict(

slapos/recipe/lamp/template/my.cnf.in

@@ -21,7 +21,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

slapos/recipe/mysql/template/my.cnf.in

@@ -19,7 +19,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

slapos/recipe/tidstorage/__init__.py

@@ -29,13 +29,21 @@ from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
   def install(self):
-    path_list = []
-    a = path_list.append
-    configuration_file = self.createFile(self.options['configuration-path'], self.substituteTemplate(self.getTemplateFilename('tidstorage.py.in'), self.options))
-    a(configuration_file)
-    tidstorage_wrapper = self.createPythonScript(self.options['tidstorage-wrapper'], 'slapos.recipe.librecipe.execute.execute', [self.options['tidstoraged-binary'], '--nofork', '--config', configuration_file])
-    a(tidstorage_wrapper)
-    repozo_wrapper = self.createPythonScript(self.options['repozo-wrapper'], 'slapos.recipe.librecipe.execute.execute', [self.options['tidstorage-repozo-binary'], '--config', configuration_file, '--repozo', self.options['repozo-binary'], '-z'])
-    a(repozo_wrapper)
+    configuration_file = self.createFile(
+      self.options['configuration-path'],
+      self.substituteTemplate(
+        self.getTemplateFilename('tidstorage.py.in'), self.options))
 
-    return path_list
+    tidstorage_wrapper = self.createPythonScript(
+      self.options['tidstorage-wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      [self.options['tidstoraged-binary'],  '--nofork', '--config',
+        configuration_file])
+
+    repozo_wrapper = self.createPythonScript(
+      self.options['repozo-wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      [self.options['tidstorage-repozo-binary'], '--config',
+        configuration_file, '--repozo', self.options['repozo-binary'], '-z'])
+
+    return [configuration_file, tidstorage_wrapper, repozo_wrapper]

slapos/recipe/tidstorage/template/tidstorage.py.in

 known_tid_storage_identifier_dict = %(known-tid-storage-identifier-dict)s
-base_url = '%(base-url)s'
 address = '%(ip)s'
 port = %(port)s
 

slapos/recipe/xwiki/template/my.cnf.in

@@ -21,7 +21,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

stack/erp5/buildout.cfg

@@ -17,7 +17,7 @@ find-links =
 
 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.23/versions.cfg
+  http://svn.zope.org/repos/main/Zope/tags/2.12.25/versions.cfg
   ../../stack/slapos.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/dcron/buildout.cfg
@@ -48,7 +48,6 @@ extends =
   ../../component/python-2.7/buildout.cfg
   ../../component/python-ldap-python/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
-  ../../component/sphinx/buildout.cfg
   ../../component/stunnel/buildout.cfg
   ../../component/subversion/buildout.cfg
   ../../component/tesseract/buildout.cfg
@@ -85,7 +84,6 @@ parts =
   ghostscript
   mariadb
   mroonga-mariadb
-  sphinx
   imagemagick
   libdmtx
   dmtx-utils
@@ -186,7 +184,7 @@ context =
 [template-mariadb]
 < = template-jinja2-base
 filename = instance-mariadb.cfg
-md5sum = 0e8e9bfc8c8a5f1bd71f5c4f346ef68b
+md5sum = 867bd8e3c4f56db2aab2fcad59f2efd8
 extra-context =
     key coreutils_location coreutils:location
     key dcron_location dcron:location
@@ -200,13 +198,6 @@ extra-context =
     key sed_location sed:location
     key xtrabackup_location xtrabackup:location
 
-[template-sphinx]
-< = template-jinja2-base
-filename = instance-sphinx.cfg
-md5sum = e3975afd5220f251d6b6e7024a2ca08b
-extra-context =
-    key sphinx_location sphinx:location
-
 [template-zope]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-zope.cfg.in
@@ -227,7 +218,7 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = 520e39f2612a045b42c0ad914bfdc5a9
+md5sum = 1f3e7cfc719d3c2eee4860678f6a67df
 mode = 640
 
 [template-cloudooo]
@@ -239,7 +230,7 @@ mode = 640
 [template-zope-conf]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/zope.conf.in
-md5sum = 599e004c18fd3461aa846ae75bd112f2
+md5sum = bc2154161a1d5baddc4ed4dfaaf94fbe
 mode = 640
 
 [template]
@@ -247,7 +238,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 26d26c357053af48602b5110120bd085
+md5sum = 700b8729a4d9a8423ab2a99de486cc31
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
@@ -292,7 +283,6 @@ extra-context =
     key template_kumofs template-kumofs:rendered
     key template_mariadb template-mariadb:rendered
     key template_memcached template-memcached:rendered
-    key template_sphinx template-sphinx:rendered
     key template_tidstorage template-tidstorage:target
     key template_varnish template-varnish:target
     key template_zope template-zope:target
@@ -320,7 +310,7 @@ mode = 640
 [template-erp5-cluster]
 < = template-jinja2-base
 filename = instance-erp5-cluster.cfg
-md5sum = 3051f3fea39d7409c417dcac26027b56
+md5sum = b4a9688ca7983fac5dd573e66c6e4263
 extra-context =
     key local_bt5_repository local-bt5-repository:list
 
@@ -473,9 +463,10 @@ eggs =
   huBarcode
   qrcode
 
-# Zope 2.12 with patched acquisition
+# Zope
   ZODB3
   Zope2
+# Zope acquisition patch
   Acquisition
 
 # Other Zope 2 packages
@@ -574,7 +565,7 @@ pysvn = 1.7.4nxd006
 
 # CMF 2.3 requries Zope 2.13.
 Products.CMFCalendar = 2.2.2
-Products.CMFCore = 2.2.5
+Products.CMFCore = 2.2.6
 Products.CMFDefault = 2.2.2
 Products.CMFTopic = 2.2.1
 Products.CMFUid = 2.2.1
@@ -583,7 +574,7 @@ Products.CMFUid = 2.2.1
 slapos.cookbook =
 
 # Pinned versions
-Flask = 0.8
+Flask = 0.9
 GitPython = 0.3.2.RC1
 MySQL-python = 1.2.3
 PIL = 1.1.7
@@ -591,68 +582,63 @@ Paste = 1.7.5.1
 PasteDeploy = 1.5.0
 PasteScript = 1.7.5
 Products.CMFActionIcons = 2.1.3
-Products.CMFCalendar = 2.2.2
-Products.CMFCore = 2.2.5
-Products.CMFDefault = 2.2.2
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
 Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
-Products.GenericSetup = 1.7.1
+Products.GenericSetup = 1.7.2
 Products.MimetypesRegistry = 2.0.3
-Products.PluggableAuthService = 1.7.7
-Products.PluginRegistry = 1.3b1
-Products.TIDStorage = 5.4.7.dev-r45842
+Products.PluggableAuthService = 1.8.0
+Products.PluginRegistry = 1.3
+Products.TIDStorage = 5.4.8
 Products.Zelenium = 1.0.3
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 Werkzeug = 0.8.3
-apache-libcloud = 0.9.1
-argparse = 1.1
+apache-libcloud = 0.11.1
+argparse = 1.2.1
 async = 0.6.1
 atomize = 0.1.1
 buildout-versions = 1.7
 cElementTree = 1.0.5-20051216
-chardet = 1.0.1
-coverage = 3.5.1
+chardet = 1.1
+coverage = 3.5.2
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
-erp5.util = 0.4.6
+erp5.util = 0.4.7
 erp5diff = 0.8.1.5
-eventlet = 0.9.16
-feedparser = 5.1.1
+eventlet = 0.9.17
+feedparser = 5.1.2
 five.localsitemanager = 2.0.5
 fpconst = 0.7.2
 gitdb = 0.5.4
-greenlet = 0.3.4
-hexagonit.recipe.cmmi = 1.5.0
-http-parser = 0.7.5
+greenlet = 0.4.0
+hexagonit.recipe.cmmi = 1.6
+http-parser = 0.7.8
 huBarcode = 0.63
 inotifyx = 0.2.0
-ipdb = 0.6.1
-ipython = 0.12
+ipdb = 0.7
+ipython = 0.13
 meld3 = 0.6.8
-netaddr = 0.7.6
+netaddr = 0.7.9
 netifaces = 0.8
 ordereddict = 1.1
-paramiko = 1.7.7.1
+paramiko = 1.7.7.2
 plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.0
-psutil = 0.4.1
-python-ldap = 2.4.9
-python-magic = 0.4.2
+psutil = 0.6.1
+python-ldap = 2.4.10
+python-magic = 0.4.3
 python-memcached = 1.47
-restkit = 4.1.2
+restkit = 4.2.0
 rtjp-eventlet = 0.3.2
 setuptools = 0.6c12dev-r88846
-slapos.core = 0.24
-slapos.recipe.build = 0.7
-slapos.recipe.template = 2.4
-slapos.toolbox = 0.23
+slapos.core = 0.28
+slapos.recipe.build = 0.10
+slapos.recipe.template = 2.4.2
+slapos.toolbox = 0.29
 smmap = 0.8.2
-socketpool = 0.3.0
+socketpool = 0.5.2
 supervisor = 3.0a12
 threadframe = 0.2
 timerserver = 2.0.2
@@ -661,3 +647,6 @@ uuid = 1.30
 validictory = 0.8.3
 xml-marshaller = 0.9.7
 xupdate-processor = 0.4
+mr.developer = 1.21
+qrcode = 2.4.1
+requests = 0.13.2

stack/erp5/instance-erp5-cluster.cfg.in

@@ -24,13 +24,6 @@ cert-file = ${slap-connection:cert-file}
 computer-id = ${slap-connection:computer-id}
 partition-id = ${slap-connection:partition-id}
 
-[request-sphinx]
-<=request-common
-name = Sphinx Search Engine
-software-type = sphinx
-sla-computer_guid = ${slap-parameter:sphinx-computer-guid}
-return = url-sphinx url-sphinx-sql
-
 [request-mariadb]
 <=request-common
 name = MariaDB DataBase
@@ -67,8 +60,6 @@ config =
   memcached-url
   cloudooo-url
   kumofs-url
-  sphinx-url-sphinx
-  sphinx-url-sphinx-sql
   smtp-url
   bt5
   bt5-repository-url
@@ -77,8 +68,6 @@ config-mysql-url = ${request-mariadb:connection-url}
 config-memcached-url = ${request-memcached:connection-url}
 config-cloudooo-url = ${request-cloudooo:connection-url}
 config-kumofs-url = ${request-kumofs:connection-url}
-config-sphinx-url-sphinx = ${request-sphinx:connection-url-sphinx}
-config-sphinx-url-sphinx-sql = ${request-sphinx:connection-url-sphinx-sql}
 config-bt5 = ${slap-parameter:bt5}
 config-bt5-repository-url = ${slap-parameter:bt5-repository-url}
 config-smtp-url = ${slap-parameter:smtp-url}
@@ -97,7 +86,6 @@ sla-computer_guid = ${slap-parameter:varnish-computer-guid}
 
 [slap-parameter]
 # Default value if no computer_guid is specified for each type
-sphinx-computer-guid = ${slap-connection:computer-id}
 mariadb-computer-guid = ${slap-connection:computer-id}
 cloudooo-computer-guid = ${slap-connection:computer-id}
 memcached-computer-guid = ${slap-connection:computer-id}

stack/erp5/instance-mariadb.cfg.in

@@ -30,7 +30,7 @@ recipe = slapos.cookbook:generic.mysql
 
 # Options
 user = user
-parallel-test-database-amount = 100
+parallel-test-database-amount = ${slap-parameter:test-database-amount}
 port = 45678
 ip = ${slap-network-information:local-ipv4}
 database = erp5
@@ -178,3 +178,6 @@ recipe = slapos.cookbook:check_port_listening
 path = ${basedirectory:promise}/mariadb
 hostname = ${mariadb-instance:ip}
 port = ${mariadb-instance:port}
+
+[slap-parameter]
+test-database-amount = 100

stack/erp5/instance-sphinx.cfg.in

-[buildout]
-parts =
-  publish-sphinx-url
-  sphinxd-instance
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
-[publish-sphinx-url]
-recipe = slapos.cookbook:publish
-url-sphinx = sphinx://${sphinxd-instance:ip}:${sphinxd-instance:sphinx-port}
-url-sphinx-sql = mysql://${sphinxd-instance:ip}:${sphinxd-instance:sql-port}
-
-[sphinxd-instance]
-recipe = slapos.cookbook:sphinx
-data-directory = ${directory:sphinx-data}
-configuration-file = ${rootdirectory:etc}/sphinx.conf
-searchd-log = ${basedirectory:log}/sphinx-searchd.log
-query-log = ${basedirectory:log}/sphinx-query.log
-pid = ${basedirectory:run}/sphinx-searchd.pid
-ip = ${slap-network-information:local-ipv4}
-sphinx-port = 9312
-sql-port = 9306
-wrapper = ${basedirectory:services}/sphinxd
-sphinx-searchd-binary = {{ sphinx_location }}/bin/searchd
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
-var = ${buildout:directory}/var
-srv = ${buildout:directory}/srv
-bin = ${buildout:directory}/bin
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = ${rootdirectory:var}/log
-services = ${rootdirectory:etc}/run
-run = ${rootdirectory:var}/run
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-sphinx-data = ${rootdirectory:srv}/sphinx

stack/erp5/instance-tidstorage.cfg.in

@@ -485,7 +485,6 @@ recipe = slapos.cookbook:publish
 [tidstorage]
 recipe = slapos.cookbook:tidstorage
 known-tid-storage-identifier-dict = {{ known_tid_storage_identifier_dict }}
-base-url = http://${zope-admin:ip}:${zope-admin:port}/%s/serialize
 configuration-path = ${directory:etc}/tidstorage.py
 ip = {{ ipv4 }}
 port = 6001

stack/erp5/instance.cfg.in

@@ -197,7 +197,6 @@ memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}
 zope = ${dynamic-template-zope:rendered}
 mariadb = {{ template_mariadb }}
-sphinx = {{ template_sphinx }}
 tidstorage = ${dynamic-template-tidstorage:rendered}
 varnish = ${dynamic-template-varnish:rendered}
 

stack/erp5/zope.conf.in

@@ -43,10 +43,11 @@ products {{ instance_products }}
 </product-config>
 
 {% endif -%}
-{% if 'timerserver-interval' in parameter_dict -%}
+{% set timerserver_interval = parameter_dict.get('timerserver-interval', '0') | int -%}
+{% if timerserver_interval -%}
 %import timerserver
 <timer-server>
-  interval {{ parameter_dict['timerserver-interval'] }}
+  interval {{ timerserver_interval }}
 </timer-server>
 
 {% endif -%}

stack/slapos.cfg

@@ -24,6 +24,7 @@ find-links +=
 
 # Use only quite well working sites.
 allow-hosts +=
+  *.googlecode.com
   *.nexedi.org
   *.python.org
   *.sourceforge.net
@@ -34,7 +35,6 @@ allow-hosts +=
   github.com
   launchpad.net
   peak.telecommunity.com
-  psutil.googlecode.com
   sourceforge.net
   www.dabeaz.com
   www.owlfish.com