Merge branch 'erp5'

Conflicts: software/erp5/software.cfg stack/erp5.cfg

Merge branch 'erp5'
Conflicts: software/erp5/software.cfg stack/erp5.cfg
39f29783 · Rafael Monnerat · f7fdb589 · 04a17a69 · 39f29783 · 39f29783
Commit 39f29783 authored Jul 15, 2011 by Rafael Monnerat 👻
15 changed files
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -11,8 +11,8 @@ parts =

 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.21.3.tar.bz2
-md5sum = 5b57fee22090b5c43a6886fdd35af2ce
+url = http://curl.haxx.se/download/curl-7.21.7.tar.bz2
+md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
 configure-options =
  --disable-static
  --disable-ldap

--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
@@ -5,8 +5,8 @@ extends =

 [glib]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.7.tar.bz2
-md5sum = feda1650c8646ad39c7b01d95b03766b
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
+md5sum = 789e7520f71c6a4bf08bc683ec764d24
 configure-options =
  --disable-static
  --disable-selinux

--- a/component/libpng/buildout.cfg
+++ b/component/libpng/buildout.cfg
@@ -3,7 +3,6 @@ extends =
  ../zlib/buildout.cfg

 parts =
-  libpng12
  libpng

 [libpng-common]
@@ -14,12 +13,7 @@ environment =
  CPPFLAGS =-I${zlib:location}/include
  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

-[libpng12]
-<= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.44.tar.bz2
-md5sum = e3ac7879d62ad166a6f0c7441390d12b
-
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.2.tar.bz2
-md5sum = a003b37ed9afb0d9164eb7228421057c
+url = http://download.sourceforge.net/libpng/libpng-1.5.4.tar.bz2
+md5sum = b43afe39237b69859522455b215f9e85
--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
@@ -16,6 +16,8 @@ configure-options =
  --with-libxml-prefix=${libxml2:location}
  --without-crypto
  --without-python
+  --without-debug
+  --without-debugger
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include

--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -12,9 +12,9 @@ parts =

 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.2.6
+version = 5.2.7
 url = http://www.percona.com/downloads/MariaDB/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz
-md5sum = e562aca71ae16b490196f99aa7e64b55
+md5sum = 06b9b102946a3606b38348c0ebf18367
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?

--- a/component/perl-XML-SAX/buildout.cfg
+++ b/component/perl-XML-SAX/buildout.cfg
@@ -12,7 +12,8 @@ depends =
  ${perl-XML-NamespaceSupport:location}
 url = http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-0.96.tar.gz
 md5sum = bdcd4119a62505184e211e9dfaef0ab1
+# say 'y' for 'Do you want XML::SAX to alter ParserDetails.ini? [Y]' question.
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  echo y | ${perl:location}/bin/perl Makefile.PL
 environment =
  PERLLIB=blib/lib
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -14,9 +14,9 @@ filename = ${:_buildout_section_name_}

 [perl]
 recipe = hexagonit.recipe.cmmi
-version = 5.14.0
+version = 5.14.1
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = e7457deea78330c5f8eebb2fd2a45479
+md5sum = 97cd306a2c22929cc141a09568f43bb0
 patch-options = -p1
 patches =
  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}

--- a/component/readline/buildout.cfg
+++ b/component/readline/buildout.cfg
@@ -6,8 +6,8 @@ extends =

 [readline]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz
-md5sum = fc2f7e714fe792db1ce6ddc4c9fb4ef3
+url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
+md5sum = 67948acb2ca081f23359d0256e9a271c
 configure-options =
  --disable-static
  --with-ncurses=${ncurses:location}

--- a/component/sqlite3/buildout.cfg
+++ b/component/sqlite3/buildout.cfg
@@ -5,8 +5,8 @@ parts =

 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070603.tar.gz
-md5sum = 7eb41eea5ffa5cbe359a48629084c425
+url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz
+md5sum = 554026fe7fac47b1cf61c18d5fe43419
 configure-options =
  --disable-static
  --enable-readline

--- a/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/__init__.py
@@ -81,8 +81,25 @@ class Recipe(BaseSlapRecipe):

    key, certificate = self.requestCertificate('Login Based Access')
    apache_conf = dict(
-        apache_login=self.installBackendApache(ip=self.getGlobalIPv6Address(),
-          port=13000, backend=site_access, key=key, certificate=certificate))
+         apache_login=self.installBackendApache(ip=self.getGlobalIPv6Address(),
+         port=13000, backend=site_access, key=key, certificate=certificate))
+
+    connection_dict = dict(site_url=apache_conf['apache_login'])
+
+    if self.parameter_dict.get("domain_name") is not None:
+      connection_dict["backend_url"] = apache_conf['apache_login']
+      connection_dict["domain_ip"] = self.getGlobalIPv6Address()
+
+      # XXX Define a fake domain_name for now.
+      frontend_name = self.parameter_dict.get("domain_name")
+      frontend_key, frontend_certificate = \
+             self.requestCertificate(frontend_name)
+
+      connection_dict["site_url"] = self.installFrontendZopeApache(
+        ip=self.getGlobalIPv6Address(), port=13001, name=frontend_name,
+        frontend_path='/%s' % self.site_id, backend_path='/%s' % self.site_id,
+        backend_url="http://%s" % site_access, key=frontend_key,
+        certificate=frontend_certificate)

    default_bt5_list = []
    if self.parameter_dict.get("flavour", "default") == 'configurator':
@@ -97,13 +114,13 @@ class Recipe(BaseSlapRecipe):
    self.installTestSuiteRunner(ca_conf, mysql_conf, conversion_server_conf,
                           memcached_conf, kumo_conf)
    self.linkBinary()
-    self.setConnectionDict(dict(
-      site_url=apache_conf['apache_login'],
+    connection_dict.update(**dict(
      site_user=user,
      site_password=password,
      memcached_url=memcached_conf['memcached_url'],
      kumo_url=kumo_conf['kumo_address']
    ))
+    self.setConnectionDict(connection_dict)
    return self.path_list

  def installZopeStandalone(self):
@@ -130,14 +147,19 @@ class Recipe(BaseSlapRecipe):
    thread_amount_per_zope = int(self.options.get(
                                'cluster_zope_thread_amount', 1))

-    activity_node_amount = 2
-    user_node_amount = 2
+    activity_node_amount = int(self.options.get(
+                   "cluster_activity_node_amount", 2))
+
+    user_node_amount = int(self.options.get(
+                   "cluster_user_node_amount", 2))
+
    ip = self.getLocalIPv4Address()
    storage_dict = self._requestZeoFileStorage('Zeo Server 1', 'main')

    zeo_conf = self.installZeo(ip)
    tidstorage_config = dict(host=ip, port='6001')

+    # XXX How to define good values for this?
    mount_point = '/'
    check_path = '/erp5/account_module'

@@ -328,6 +350,12 @@ class Recipe(BaseSlapRecipe):
    # workaround wrong assumptions of ERP5Type.tests.runUnitTest about
    # directory existence
    unit_test = os.path.join(testinstance, 'unit_test')
+    connection_string_list = []
+    for test_database, test_user, test_password in \
+          mysql_conf['mysql_parallel_test_dict'][-4:]:
+      connection_string_list.append(
+          '%s@%s:%s %s %s' % (test_database, mysql_conf['ip'],
+                            mysql_conf['tcp_port'], test_user, test_password))
    if not os.path.isdir(unit_test):
      os.mkdir(unit_test)
    runUnitTest = zc.buildout.easy_install.scripts([
@@ -341,6 +369,7 @@ class Recipe(BaseSlapRecipe):
          '--erp5_sql_connection_string', '%(mysql_test_database)s@%'
          '(ip)s:%(tcp_port)s %(mysql_test_user)s '
          '%(mysql_test_password)s' % mysql_conf,
+          '--extra_sql_connection_string_list',','.join(connection_string_list),
          '--conversion_server_hostname=%(conversion_server_ip)s' % \
                                                         conversion_server_conf,
          '--conversion_server_port=%(conversion_server_port)s' % \
@@ -611,7 +640,7 @@ class Recipe(BaseSlapRecipe):
    return user, password

  def installERP5Site(self, user, password, zope_access, mysql_conf,
-          conversion_server_conf=None, memcached_conf=None, kumo_conf=None, 
+          conversion_server_conf=None, memcached_conf=None, kumo_conf=None,
          erp5_site_id='erp5', default_bt5_list=[]):
    """ Create a script controlled by supervisor, which creates a erp5
    site on current available zope and mysql environment"""
@@ -881,13 +910,18 @@ class Recipe(BaseSlapRecipe):
    ident = 'frontend_' + name
    apache_conf = self._getApacheConfigurationDict(ident, ip, port)
    apache_conf['server_name'] = name
+    apache_conf['frontend_path'] = frontend_path
    apache_conf['ssl_snippet'] = pkg_resources.resource_string(__name__,
        'template/apache.ssl-snippet.conf.in') % dict(
        login_certificate=certificate, login_key=key)

    rewrite_rule_template = \
        "RewriteRule ^%(path)s($|/.*) %(backend_url)s/VirtualHostBase/https/%(server_name)s:%(port)s%(backend_path)s/VirtualHostRoot/_vh_%(vhname)s$1 [L,P]\n"
-    path = pkg_resources.resource_string(__name__, 'template/apache.zope.conf.path-protected.in') % dict(path='/', access_control_string='none')
+
+    path = pkg_resources.resource_string(__name__,
+           'template/apache.zope.conf.path-protected.in') % \
+              dict(path='/', access_control_string='none')
+
    if access_control_string is None:
      path_template = pkg_resources.resource_string(__name__,
        'template/apache.zope.conf.path.in')
@@ -903,8 +937,7 @@ class Recipe(BaseSlapRecipe):
          backend_path=backend_path,
          port=apache_conf['port'],
          vhname=frontend_path.replace('/', ''),
-          server_name=name
-    )
+          server_name=name)
    rewrite_rule = rewrite_rule_template % d
    apache_conf.update(**dict(
      path_enable=path,
@@ -925,7 +958,7 @@ class Recipe(BaseSlapRecipe):
            )
          ]))
    # Note: IPv6 is assumed always
-    return 'https://[%(ip)s]:%(port)s' % apache_conf
+    return 'https://%(server_name)s:%(port)s%(frontend_path)s' % (apache_conf)

  def installBackendApache(self, ip, port, backend, key, certificate,
      suffix='', access_control_string=None):

--- a/slapos/recipe/vifib.py
+++ b/slapos/recipe/vifib.py
@@ -31,6 +31,9 @@ import zc.buildout
 import sys

 class Recipe(slapos.recipe.erp5.Recipe):
+  
+  default_bt5_list = []
+
  def installKeyAuthorisationApache(self, ip, port, backend, key, certificate,
      ca_conf, key_auth_path='/erp5/portal_slap'):
    ssl_template = """SSLEngine on
@@ -172,6 +175,12 @@ SSLCARevocationPath %(ca_crl)s"""
    self.installTidStorage(tidstorage_config['host'], tidstorage_config['port'],
        known_tid_storage_identifier_dict, 'http://'+login_haproxy)
    self.linkBinary()
+
+    # Connect direct to Zope to create the instance.
+    self.installERP5Site(user, password, service_url_list[-1], mysql_conf,
+             conversion_server_conf, memcached_conf, kumo_conf,
+             self.site_id, self.default_bt5_list)
+
    self.setConnectionDict(dict(
      front_end_url=apache_frontend_login,
      site_url=apache_login,
@@ -227,6 +236,10 @@ SSLCARevocationPath %(ca_crl)s"""
    self.installTestSuiteRunner(ca_conf, mysql_conf, conversion_server_conf,
                           memcached_conf, kumo_conf)
    self.linkBinary()
+    self.installERP5Site(user, password, zope_access, mysql_conf,
+             conversion_server_conf, memcached_conf, kumo_conf,
+             self.site_id, self.default_bt5_list)
+
    self.setConnectionDict(dict(
      development_zope='http://%s:%s/' % (ip, zope_port),
      site_user=user,
@@ -260,6 +273,9 @@ SSLCARevocationPath %(ca_crl)s"""
        [('killpidfromfile', 'slapos.recipe.erp5.killpidfromfile',
          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
    self.path_list.append(self.killpidfromfile)
+    if self.parameter_dict.get("flavour", "default") == 'configurator':
+      self.default_bt5_list = self.options.get("configurator_bt5_list", '').split()
+
    if self.parameter_dict.get('development', 'false').lower() == 'true':
      return self.installDevelopment()
    if self.parameter_dict.get('production', 'false').lower() == 'true':

--- a/software/erp5/instance.cfg
+++ b/software/erp5/instance.cfg
@@ -69,4 +69,4 @@ environment =

 bt5_repository_list = ${bt5-repository:list}

-configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
+configurator_bt5_list = ${instance-recipe:configurator_bt5_list}
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
@@ -21,11 +21,14 @@ unzip = true
 egg = slapos.cookbook
 module = erp5

+# Additional Configuration
+configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung
+
 [template]
 # Default template for erp5 instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 65d9b269e204ba49ac5ff11e891a4b84
+md5sum = cc268ff0f27fa1ed4839a3150980f4a7
 output = ${buildout:directory}/template.cfg
 mode = 0644

@@ -34,7 +37,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/configuration.json
 md5sum = cbe1d75339c6cb20e1aef818797face1 
-output = ${buildout:directory}/validator.json
+output = ${buildout:directory}/schema.json
 mode = 0644

 [versions]

--- a/software/vifib/software.cfg
+++ b/software/vifib/software.cfg
@@ -11,19 +11,16 @@ eggs += slapos.core
 [instance-recipe]
 module = vifib

+# Additional Configuration
+configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_vifib
+
+[erp5_repository_list]
+repository_id_list += vifib/master
+
 [vifib]
-# Recipe zerokspot.recipe.git is disabled, as is not possible to change its
-# environment to use localy delivered git.
-# plone.recipe.command can do same job, but it is controllable which binary
-# will be used
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+<= erp5
 repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
-revision = f95ca3ccda07292895939ef9b48678acb5f524ce
-command = ${git:location}/bin/git clone --quiet -b ${: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
+revision =

 [local-bt5-repository]
 # XXX: workaround for zc.buildout bug, as list += ends up with adding new entry

--- a/stack/erp5.cfg
+++ b/stack/erp5.cfg
@@ -2,6 +2,7 @@
 extensions =
  slapos.rebootstrap
  slapos.zcbworkarounds
+  buildout-versions
  mr.developer

 find-links =