Commit e422c314 authored by Łukasz Nowak's avatar Łukasz Nowak

Release erp5 branch, driven by Vifib development.

Squashed commit of the following:

commit 929bc31a
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 23 15:52:48 2011 +0200

    Freeze versions.

    Driven by correctly working Vifib code.

commit 8f0bb8ae
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 23 15:09:30 2011 +0200

    Froze external resource version.

    Since long time both never changed, so it seems easier to have them in frozen
    state.

commit 51fa4920
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 23 13:06:27 2011 +0200

    Partially revert de6adaeb

    Keep original intention of extending gcc, but as there are problems with
    libc conflict (libppl is linked against system libc, but later used with
    old gcc provided libc, and detects features not available in old version
    of libc) provide trimmed down gcc in order to compile pdftk.

commit f492604e
Merge: 478ef9e7 e8bc2cbc
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 23 09:52:15 2011 +0200

    Merge branch 'master' into erp5

    Conflicts:
    	component/apache/buildout.cfg
    Avoid using older version of apache from master.

    	component/libreoffice-bin/buildout.cfg
    Drop changes which problem addressed shall be done by releasing erp5 to master.

    	component/stunnel/buildout.cfg
    Drop changes which problem addressed shall be done by releasing erp5 to master.

      component/xorg/buildout.cfg
    Remove not needed garbage from master.

    	slapos/recipe/erp5/__init__.py
    Avoid cleanup removal by master.

    	slapos/recipe/erp5/template/logrotate_entry.in
    Remove not needed garbage from master.

    Manually found wrong changes on master:

      component/noVNC/buildout.cfg
    Use head instead of pinned version.

      stack/erp5.cfg
    Drop changes which problem addressed shall be done by releasing erp5 to master.

commit 478ef9e7
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 23 09:24:32 2011 +0200

    Drop reference to non existing part.

commit de6adaeb
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Sep 22 20:43:49 2011 +0200

    provide more featured gcc and change the target name from gcc-java to gcc.

commit 5c8705cc
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Sep 22 17:53:03 2011 +0200

    Revert "use our own gcc to buid libtiff and tesseract (thanks Kazuhiko)"

    This issue was found on system which had libstdc++ dynamic library not functional.
    It is pointing to broken link which results in error:

    /usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/4.4.5/libstdc++.a(ios_init.o): relocation R_X86_64_32 against `pthread_cancel' can not be used when making a shared object; recompile with -fPIC

    Each time dynamic library tries to use stdc++, as libstdc++.so was broken link.

    Currently SlapOS requires "sane" host: which has working libc, libc++ and gcc.

    Some day in future SlapOS node software can provide own compiler, toolchain
    and libc with libc++.

    This reverts commit 6819f5a8.

commit 7f4141a5
Author: Aurélien Calonne <aurel@nexedi.com>
Date:   Thu Sep 22 16:31:29 2011 +0200

    typo

commit 6819f5a8
Author: Sebastien Robin <seb@nexedi.com>
Date:   Thu Sep 22 14:59:27 2011 +0200

    use our own gcc to buid libtiff and tesseract (thanks Kazuhiko)

    This solve compilation problems on Debian 6.0.1

commit 1fa67ac6
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Sep 22 13:20:33 2011 +0200

    Use newer slapos buildout.

    It has more immunity on libnetworkcache errors.

commit 8a266be8
Author: Sebastien Robin <seb@nexedi.com>
Date:   Thu Sep 22 11:26:29 2011 +0200

    add more informations about option httpclose

commit a9b165b0
Author: Aurélien Calonne <aurel@nexedi.com>
Date:   Thu Sep 22 11:19:35 2011 +0200

    use options httpclose for haproxy, otherwise balancing is very inneficient

commit e6ba92ed
Author: Romain Courteaud <romain@nexedi.com>
Date:   Thu Sep 22 10:30:31 2011 +0200

    Not using rotate option means delete rotated logs.

    Default value of 10 years should be enough.

commit 49e06208
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Sep 21 13:58:02 2011 +0200

    version up : HAProxy 1.4.18.

commit 406feaa2
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Sep 21 13:53:15 2011 +0200

    version up : SQLite 3.7.8.

commit 29f65832
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Sep 21 13:49:07 2011 +0200

    more delailed sphinx.conf template using English stemming rule for now.

commit f0060584
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Sep 21 13:45:33 2011 +0200

    pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user and build without gpm.

commit 67dd36e4
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Tue Sep 20 13:45:30 2011 +0200

    support sphinx-searchd instantiation.

commit fdcdb743
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Tue Sep 20 10:52:45 2011 +0900

    Add missing argument for repozo and put everything in the same directory.

commit 588c3be1
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Sep 19 16:22:26 2011 +0200

    remove garbage.

commit 73b4a3ab
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Sep 19 15:36:45 2011 +0200

    Do not use not needed library.

commit 6cd4947a
Author: Aurélien Calonne <aurel@nexedi.com>
Date:   Mon Sep 19 15:34:20 2011 +0200

    forgot to commit new md5 sum

commit 7b4a909e
Author: Aurélien Calonne <aurel@nexedi.com>
Date:   Mon Sep 19 15:21:59 2011 +0200

    move to new version

commit 93dd0144
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Fri Sep 16 17:34:46 2011 +0200

    remove garbage.

commit ab109f06
Author: Romain Courteaud <romain@nexedi.com>
Date:   Fri Sep 16 15:00:51 2011 +0200

    Do not freeze egg version in components.

    This has to be done on software level.

commit d90f21d9
Author: Sebastien Robin <seb@nexedi.com>
Date:   Wed Sep 14 14:08:38 2011 +0200

    use much better default haproxy values with explanations

commit 071eb05a
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Thu Sep 15 16:52:49 2011 +0900

    Allow to add repozo to crond without tidstorage.

commit 595a6768
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Thu Sep 15 17:16:25 2011 +0900

    Fix typos introduced in dbab53e6.

commit a2d8de8e
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Sep 14 13:40:05 2011 +0200

    version up : Apache HTTP Server 2.2.21 including severay security fixes.
    * SECURITY: CVE-2011-3348 mod_proxy_ajp when combined with mod_proxy_balancer: Prevents unrecognized HTTP methods from marking ajp: balancer members in an error state, avoiding denial of service.
    * SECURITY: CVE-2011-3192 core: Further fixes to the handling of byte-range requests to use less memory, to avoid denial of service. This patch includes fixes to the patch introduced in release 2.2.20 for protocol compliance, as well as the MaxRanges directive.

commit f2cf3b11
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Sun Sep 11 21:47:41 2011 +0200

    version up : MariaDB-5.3.1-beta.

commit 2c3e6ad8
Author: Jean-Paul Smets <jp@nexedi.com>
Date:   Sat Sep 10 21:43:02 2011 +0200

    Circumvent unavailable server

commit dd144e0a
Author: Sebastien Robin <seb@nexedi.com>
Date:   Fri Sep 9 18:52:24 2011 +0200

    stunnel 4.42 is obsolete, move to 4.43 (patch from Pavel Baranchuk)

commit af0fc772
Author: Sebastien Robin <seb@nexedi.com>
Date:   Fri Sep 9 17:41:22 2011 +0200

    after kernel.org attack, we have to use another url (patch from Pavel Baranchuk)

commit dbab53e6
Author: Sebastien Robin <seb@nexedi.com>
Date:   Thu Sep 8 18:41:31 2011 +0200

    optimize haproxy server configuration and explain values

commit d09c6340
Author: Sebastien Robin <seb@nexedi.com>
Date:   Thu Sep 8 13:44:42 2011 +0200

    partially revert 30fa3e47, monthly rotate is not appropriate for all projects

commit 0322f8c0
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Sep 8 12:00:45 2011 +0200

    version up : OpenSSL 1.0.0e including important bug and security fixes

commit f2e447eb
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Sep 8 11:11:25 2011 +0200

    Setup environment in wrapper script instead of zope.conf

    zope.conf is read quite lite during zope startup and some modules are using
    environment variables to be set up (like DateTime) *before* zope.conf is read.

commit b3b64302
Author: Sebastien Robin <seb@nexedi.com>
Date:   Wed Sep 7 14:29:51 2011 +0200

    use LogFormat closer to default apache config and add request time

    In the same time, it is useless to define to logformat when only
    one is used. Using format closer to default apache allows to
    more easily use various log parsers

commit 30fa3e47
Author: Sebastien Robin <seb@nexedi.com>
Date:   Wed Sep 7 11:57:34 2011 +0200

    change logrotate policy, rotate every month, and keep logs forever

    For performance analysis, it is mandatory to keep logs for a very long
    time. Also it is sometimes required to analyse a bug that happened
    more than one more ago, so we have no other choices than keep logs
    and not remove them.

commit bb3d694b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Sep 5 23:32:24 2011 +0200

    version up : haproxy-1.4.17.

commit aa64c97f
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Sep 5 22:39:56 2011 +0200

    cleanup mysql-5.1 and mariadb.

commit 6c502cb6
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Sep 5 21:38:31 2011 +0200

    version up : MySQL-5.1.58 and sphinx search engine based on sphinx-2.0.1-beta.

commit 67cd8b46
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Sep 5 16:37:31 2011 +0200

    Use download utility from build recipe.

commit d9b0218a
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Sep 5 16:30:50 2011 +0200

    Typo: versions were not removed.

commit 2bea3403
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Sep 5 16:23:28 2011 +0200

    Drop specific z3c.recipe.openoffice.

    slapos.recipe.build allows to install openoffice in same way as z3c.recipe.openoffice.
    Additionaly it does not hardcode internally paths or binaries, so less code
    updates are needed.

commit e7c3a58f
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Fri Sep 2 21:31:54 2011 +0200

    version up : groonga-1.2.5 and groonga-storage-engine-0.5

commit b8606deb
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 2 16:59:26 2011 +0200

    Update url of new released version.

commit b392f73d
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Sep 2 11:12:17 2011 +0200

    Pick the newest buildout and drop workaround.

    slapos.libnetworkcache does not depend anymore on M2Crypto (it uses openssl
    binary internally and it is optional).

    1.5.3-dev-SlapOS-009 version of zc.buildout is safe to be used with new,
    stabilised API to library.

commit 5f3bed6b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Aug 31 08:04:24 2011 +0200

    version up : apache httpd 2.2.20 including a fix for CVE-2011-3192.

commit bb41ec35
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Tue Aug 30 11:12:32 2011 +0200

    Fixup 28c78ec2.

    Readd removed sleep.

commit 299752f5
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Tue Aug 30 11:01:25 2011 +0200

    Stabilise ZODB naming.

    It shall be possible to switch easily between Zeo/Zope configuration without
    need to copy ZODB.

commit d44a97f9
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Aug 29 18:25:53 2011 +0200

    Implement optional key authorisation entry point.

commit 4bdba2e6
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Aug 29 17:45:00 2011 +0200

    Remove not needed connection dict parameters.

    ERP5 updater takes care of configuration certificate authority tool.

commit 28c78ec2
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Aug 29 17:43:16 2011 +0200

    Configure certificate authority.

    Rely on portal introspections functionality.

commit fe7a0738
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Aug 29 12:15:13 2011 +0200

    libreoffice depends on libICE and libSM too.

commit 90c5fe0f
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Aug 26 16:57:58 2011 +0200

    Follow current changes.

commit 3211d505
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Aug 26 17:58:57 2011 +0200

    Revert "Separate from operating system."

    This reverts commit 84b1322c.

    I want to wrong way.

commit 84b1322c
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Aug 26 17:52:56 2011 +0200

    Separate from operating system.

    Some variables might be present, which can influcence the compilation.

commit e88bce15
Author: Romain Courteaud <romain@nexedi.com>
Date:   Fri Aug 26 13:10:30 2011 +0200

    Allow mysql connection from localhost

    As described in: http://dev.mysql.com/doc/refman/5.1/en/access-denied.html
    """
    If you cannot figure out why you get Access denied, remove from the user  table
    all entries that have Host values containing wildcards (entries that contain
    '%' or '_'  characters). A very common error is to insert a new entry with
    Host='%'  and User='some_user', thinking that this enables you to specify
    localhost to connect from the same machine. The reason that this does not work
    is that the default privileges include an entry with Host='localhost'  and
    User=''. Because that entry has a Host value 'localhost' that is more specific
    than '%', it is used in preference to the new entry when connecting from
    localhost! The correct procedure is to insert a second entry with
    Host='localhost'  and User='some_user', or to delete the entry with
    Host='localhost'  and User=''. After deleting the entry, remember to issue a
    FLUSH PRIVILEGES statement to reload the grant tables.
    """

commit 2d8c0f42
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Aug 25 17:34:10 2011 +0200

    Stunnel 4.39 is not available anymore, so move to 4.42.

commit cf1b4e9b
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Thu Aug 25 15:44:37 2011 +0900

    Fix supervisor_controlled parameter for erp5_update script.

    If erp5_update is controlled through supervisord, then put it in etc/run/
    (slapgrid adds all the content of this directory to supervisord), otherwise,
    put it in bin directory.

commit 8ee6f05f
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Thu Aug 25 11:55:05 2011 +0900

    Fix typo.

commit c683bff6
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Aug 24 21:13:35 2011 +0200

    version up : poppler-0.17.2. disable building a static library.

commit 41b5bc46
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Aug 24 21:04:03 2011 +0200

    cleanup xorg/buildout.cfg.

commit 89c6ecec
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Aug 24 16:08:14 2011 +0200

    libreoffice 3.4 depends on libXinerama.

commit 85b0a08b
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Tue Aug 23 19:04:07 2011 +0900

    Add products-deps as well (following 06bde8c4).

commit 06bde8c4
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Tue Aug 23 16:24:23 2011 +0900

    Fix ERP5 products path for Zeo conflict resolution.

commit 531c2a30
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Aug 22 11:37:03 2011 +0200

    Update md5sum missing in 63026d62.

commit 2edb5d39
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Aug 22 11:31:22 2011 +0200

    add the patch in our repository because its content might differ by remote server's git version.

commit fadaca9e
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Aug 22 11:26:35 2011 +0200

    version up : liberation-fonts-ttf-1.07.0.

commit c304b671
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Mon Aug 22 13:27:43 2011 +0900

    Update md5sum missing in 63026d62.

commit 63026d62
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Fri Aug 19 22:06:00 2011 +0900

    our own fontconfig should be also included in LD_LIBRARY_PATH so that we can force using our own fonts.

commit 85b52784
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Fri Aug 19 21:28:25 2011 +0900

    Allow to set zodb and zeo client cache sizes.

commit 8a31a2a3
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Thu Aug 18 14:55:18 2011 +0900

    Allow to specify cache_size for zeo client.

commit 6057343c
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Aug 17 15:00:44 2011 +0900

    version up : haproxy-1.4.16.

commit b939a999
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Mon Aug 15 17:01:40 2011 +0900

    Allow to specify userParameter options upon instanciation of zabbix agentd.

commit 4da99694
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Mon Aug 15 17:01:15 2011 +0900

    Move instanciation of zabbix agentd to a dedicated method.

commit 706ccb3a
Author: Julien Muchembled <jm@nexedi.com>
Date:   Sat Aug 13 03:14:23 2011 +0200

    bin/runUnitTest: prevent Testing from importing Zope2.App instead of App

commit faeeea1f
Author: Julien Muchembled <jm@nexedi.com>
Date:   Sat Aug 13 02:52:52 2011 +0200

    bin/runUnitTest: buildout does not allow to indent Python code...

commit a2484d5f
Author: Julien Muchembled <jm@nexedi.com>
Date:   Fri Aug 12 17:28:00 2011 +0200

    bin/runUnitTest: fix ZEO mode by not loading ZEO.ClientStorage too early

    This is required by testConflictResolution & testInvalidationBug.

commit 7efd3421
Author: Julien Muchembled <jm@nexedi.com>
Date:   Fri Aug 12 17:16:19 2011 +0200

    bin/runUnitTest: code readibility

    The only functional change is the following:
    - before: sys.path begins with [*/product/*/tests] followed by [*/tests]
    - after: sys.path begins with [prj1/product/*/tests, prj1/tests,
                                   prj2/product/*/tests, prj2/tests,
                                   ...]
    This should have no impact.

commit a03793d3
Author: Julien Muchembled <jm@nexedi.com>
Date:   Fri Aug 12 16:15:51 2011 +0200

    Add msec to zeo/zope logs

    Also remove 2 configuration lines that only repeated the default values

commit 32a74d46
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Tue Aug 9 19:26:40 2011 +0900

    Avoid calling self.getMissingBusinessTemplateSet() twice.

commit 151a120e
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Tue Aug 9 19:22:44 2011 +0900

    When updating bt5, update repositories before even if they are already present
    because new bt5 may have been added in the meantime.

commit 9f72c8fe
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Aug 11 16:33:54 2011 +0200

    Update md5sum.

    It was missing in 3a157be8

commit 91e845de
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Aug 11 15:56:49 2011 +0200

    Drop mr.developer usage.

    It is not used by default.

    It mangles buildout:develop as described in https://github.com/fschulze/mr.developer/issues/57,
    and buildout:develop is used in many project to checkout and develop various
    eggs in "slapos" way.

commit 6722147a
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Thu Aug 11 10:38:59 2011 +0200

    Apply temporary workaround for slapos.libnetworkcache

commit 069dbaff
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Tue Aug 9 20:35:13 2011 +0900

    update z3c.recipe.openoffice = 0.3.1dev9 to support LibreOffice-3.4.

commit ab86b98a
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Fri Aug 5 16:02:13 2011 +0900

    Add gcc patch for multiarch support.

    On Debian-based distributions,  gcc FTBFS because of special  linker files and
    architecture-dependent  headers being  available in  /usr/lib/<triplet> rather
    than /usr/lib  and /usr/lib64. This avoids  settings respectively LIBRARY_PATH
    and CPATH manually on such distributions.

commit fd87c01c
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Aug 8 09:31:33 2011 +0900

    version up : MariaDB-5.3.0-beta introducing subquery optimisation, handlersocket etc.
    http://kb.askmonty.org/en/mariadb-530-release-notes

commit 3a157be8
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Fri Aug 5 11:14:55 2011 +0900

    Use zabbix_agentd rather than zabbix_agent for erp5 instanciation.

    zabbix_agentd is  a standalone  daemon which can  be ran  through supervisord,
    whereas zabbix_agent is  supposed to be used with inetd,  thus use the former,
    likewise zabbix-agent software instanciation profile.

commit ef57d0ed
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Tue Aug 2 18:24:29 2011 +0900

    Allow to run erp5_update script manually, meaningful for production servers.

commit 14dbacca
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Aug 1 17:29:29 2011 +0200

    Fixup fb0c783d

    Need to allow from www.owlfish.com, as WSGIUtils is available there.

commit 36ce6518
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Mon Aug 1 14:20:29 2011 +0200

    Workaround for WSGIUtils begin removed from pypi.

commit 18f43403
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Mon Aug 1 12:46:51 2011 +0900

    version up : freetype-2.4.6 security release.

commit 20e9e476
Author: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
Date:   Fri Jul 29 11:39:24 2011 +0900

    Fix typo in instance attribute name.

commit 90ca8a21
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 21:45:08 2011 -0300

    Create certificate for front end and fix backend_path

commit 614e0f9c
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 21:44:22 2011 -0300

    Permit use provide his own domain name (like in erp5 default)

commit 8a0b28b0
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 21:42:56 2011 -0300

    Added comment.

commit c17afe1e
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 21:41:20 2011 -0300

    Fix front end providing access to Zope.

commit c99d0904
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 21:40:21 2011 -0300

    Fix when single "/" is provided as front end path.

commit 892f2055
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 21:39:40 2011 -0300

    Reorganize to improve readability.

commit 67c6efdf
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 17:19:16 2011 -0300

    tinny style change

    Added white spaces arround "="

commit 64253339
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 15:50:29 2011 -0300

    Wait longer between the runs.

commit a72e960e
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 15:50:00 2011 -0300

    Post conversion coordinates when create the System Preference.

commit 91c9fe2e
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 28 15:37:28 2011 -0300

    No need use variable here

commit 64ba0f2d
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 18:03:55 2011 -0300

    Increase long wait to 5 minutes instead 3 minutes between runs.

    This value could be much higher in future because it is only sleep for so
    long after instance be well setupped.

commit 0a78dde5
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 18:01:09 2011 -0300

    It is not required to wait for activities here.

commit 84afd096
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 17:59:32 2011 -0300

    Use Set() instead lists to simplify the code.

commit 799fe78e
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 17:58:18 2011 -0300

    Remove not implemented code, Such API is not well defined yet.

commit 1e6d5631
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 17:57:22 2011 -0300

    Use new TemplateTool API

commit b44be8f1
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 17:56:24 2011 -0300

    simplify check for activities running.

commit 7e80f287
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 17:55:00 2011 -0300

    Connect to apache backend instead zope.

commit 1053d6cb
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Tue Jul 26 17:54:16 2011 -0300

    Enable SSLProxyEngine by default.

commit 53987119
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 21 17:30:12 2011 -0300

    Fix Default value

commit 0c46652c
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Thu Jul 21 17:29:42 2011 -0300

    Now portal_introspections is present since begin.

commit faa673cc
Author: Sebastien Robin <seb@nexedi.com>
Date:   Thu Jul 28 14:13:09 2011 +0200

    the patch was changes, the md5sum needs to be updated

commit 5a4e3d5b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Thu Jul 28 19:51:25 2011 +0900

    rename the patch filename so that patch is well updated.

commit e8ef845b
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Jul 27 18:50:53 2011 +0900

    versino up : memcached-1.4.6.

commit 4a64cfe2
Author: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date:   Wed Jul 27 18:33:42 2011 +0900

    version up : xtrabackup-1.6.2.

commit e11f1f3d
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Tue Jul 19 09:48:22 2011 +0200

    Install developmeny by default.

commit aa21fc97
Author: Rafael Monnerat <rafael@nexedi.com>
Date:   Mon Jul 18 15:49:31 2011 -0300

    Unfreeze erp5 and vifib (post merge with master)
parent e8bc2cbc
......@@ -16,8 +16,8 @@ extends =
[apache-no-ssl]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = hexagonit.recipe.cmmi
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.20.tar.bz2
md5sum = 1ac251431c8c4285f6b085c1d156bb56
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
configure-options = --enable-authn-alias
--enable-bucketeer
--enable-cache
......@@ -66,8 +66,8 @@ configure-options = --enable-authn-alias
[apache]
# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
recipe = hexagonit.recipe.cmmi
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.20.tar.bz2
md5sum = 1ac251431c8c4285f6b085c1d156bb56
url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.21.tar.bz2
md5sum = 1696ae62cd879ab1d4dd9ff021a470f2
configure-options = --disable-static
--enable-authn-alias
--enable-bucketeer
......
......@@ -12,8 +12,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[liberation-fonts]
recipe = hexagonit.recipe.download
strip-top-level-dir = true
url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.06.0.20100721.tar.gz
md5sum = ca4870d899fd7e943ffc310a5421ad4d
url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.07.0.tar.gz
md5sum = 8150db1c6e27cacdfd524b563b85b69e
destination = ${fonts:location}/${:_buildout_section_name_}
# IPAex Font - Japanese fonts provided by IPA
......
......@@ -10,8 +10,8 @@ parts =
[freetype]
recipe = hexagonit.recipe.cmmi
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.5.tar.bz2
md5sum = 90428a6d8ec4876cd1eb94858c2a59b0
url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2
md5sum = 5e6510613f612809d2d7862592b92ab7
configure-options =
--disable-static
environment =
......
......@@ -6,17 +6,20 @@ extends =
../zip/buildout.cfg
parts =
gcc-java
gcc
[gmp]
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.gmplib.org/pub/gmp-5.0.2/gmp-5.0.2.tar.bz2
md5sum = 0bbaedc82fb30315b06b1588b9077cd3
# we should use version 4.x for ppl-0.10
url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
md5sum = dd60683d7057917e34630b4a787932e8
# GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses
# backticks are working
configure-options =
--build=`uname -m`-linux
--enable-cxx
--disable-static
environment =
PATH=${m4:location}/bin:%(PATH)s
......@@ -26,9 +29,9 @@ url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
configure-options =
--with-gmp=${gmp:location}
--disable-static
environment =
CPPFLAGS =-I${gmp:location}/include
LDFLAGS =-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
LDFLAGS=-Wl,-rpath=${gmp:location}/lib
[mpc]
recipe = hexagonit.recipe.cmmi
......@@ -37,9 +40,34 @@ md5sum = 0d6acab8d214bd7d1fbbc593e83dd00d
configure-options =
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--disable-static
environment =
CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include
LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib
[ppl]
recipe = hexagonit.recipe.cmmi
# we should use version 0.10.x for gcc-4.5
url = http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
md5sum = 5667111f53150618b0fa522ffc53fc3e
configure-options =
--with-libgmp-prefix=${gmp:location}
--with-libgmpxx-prefix=${gmp:location}
--disable-static
environment =
PATH=${m4:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${gmp:location}/lib
[cloog-ppl]
recipe = hexagonit.recipe.cmmi
url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
md5sum = 806e001d1b1a6b130069ff6274900af5
configure-options =
--with-gmp=${gmp:location}
--with-ppl=${ppl:location}
--disable-static
environment =
PATH=${m4:location}/bin:%(PATH)s
LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib
[ecj]
recipe = hexagonit.recipe.download
......@@ -53,33 +81,42 @@ recipe = hexagonit.recipe.download
url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
strip-top-level-dir = True
destination = ${gcc-java-source:location}
destination = ${gcc-source:location}
[gcc-java-download]
recipe = hexagonit.recipe.download
url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
strip-top-level-dir = True
destination = ${gcc-java-source:location}
destination = ${gcc-source:location}
ignore-existing = true
[gcc-java-source]
[gcc-source]
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[gcc-java]
[gcc-multiarch.patch]
recipe = hexagonit.recipe.download
md5sum = 819e6735270c8a432b0512b49f40219f
url = ${:_profile_base_location_}/${:filename}
filename = ${:_buildout_section_name_}
download-only = true
[gcc-java-minimal]
depends =
${gcc-download:location}
${gcc-java-download:location}
recipe = hexagonit.recipe.cmmi
path = ${gcc-java-source:location}
path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427
patches =
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
patch-options = -p2
configure-command = make clean \\; make distclean \\; ./configure
# GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses
# backticks are working
configure-options =
--disable-bootstrap
--build=`uname -m`-linux
--enable-languages=java
--disable-multilib
--with-gmp=${gmp:location}
......@@ -87,6 +124,8 @@ configure-options =
--with-mpc=${mpc:location}
--with-ecj-jar=${ecj:location}/${ecj:filename}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--without-ppl
--without-cloog
environment =
CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
......@@ -94,3 +133,35 @@ environment =
PATH=${zip:location}/bin:%(PATH)s
# make install does not work when several core are used
make-targets = install -j1
[gcc]
depends =
${gcc-download:location}
${gcc-java-download:location}
recipe = hexagonit.recipe.cmmi
path = ${gcc-source:location}
md5sum = bb3265edf0fa7543e50cedb93e04e427
patches =
${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
patch-options = -p2
configure-command = make clean \\; make distclean \\; ./configure
# GMP does not correctly detect achitecture so it have to be given
# as hexagonit.recipe.cmmi is using shell expansion in subproceses
# backticks are working
configure-options =
--disable-bootstrap
--enable-languages="c,c++,java"
--disable-multilib
--with-gmp=${gmp:location}
--with-mpfr=${mpfr:location}
--with-mpc=${mpc:location}
--with-ppl=${ppl:location}
--with-cloog=${cloog-ppl:location}
--with-ecj-jar=${ecj:location}/${ecj:filename}
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
environment =
LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
PATH=${zip:location}/bin:%(PATH)s
# make install does not work when several core are used
make-targets = install -j1
This diff is collapsed.
# mroonga - a MySQL storage engine using full-text search engine groonga
# http://mroonga.github.com/
# http://groonga.org/
[buildout]
parts =
groonga
[groonga]
recipe = hexagonit.recipe.cmmi
url = http://packages.groonga.org/source/groonga/groonga-1.2.5.tar.gz
md5sum = 7e608406677b7a3f91e287acc0c718c0
configure-options =
--disable-static
--disable-glibtest
--without-mecab
......@@ -3,8 +3,8 @@ parts = haproxy
[haproxy]
recipe = hexagonit.recipe.cmmi
url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.15.tar.gz
md5sum = c1b4fc6028c6d8e23dde8c91ff47eabe
url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.18.tar.gz
md5sum = 4ac88bb1a76c4b84ed4f6131183bedbe
configure-command = true
# If the system is running on Linux 2.6, we use "linux26" as the TARGET,
# otherwise use "generic".
......
[buildout]
extends = ../cpio/buildout.cfg
extends =
../cpio/buildout.cfg
../rpm2cpio/buildout.cfg
parts =
libreoffice-bin
find-links =
http://www.nexedi.org/static/packages/source/
versions = versions
[versions]
# special version of z3c.recipe.openoffice with architecture autodetection
z3c.recipe.openoffice = 0.3.1dev8
[libreoffice-bin]
recipe = z3c.recipe.openoffice
install-javafilter = no
install-pyuno-egg = no
hack-openoffice-python = no
flavour = libreoffice
recipe = slapos.recipe.build
# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
#base-url = http://download.documentfoundation.org/libreoffice/stable/3.3.2/rpm/%s/LibO_3.3.2_Linux_%s_install-rpm_en-US.tar.gz
base-url = http://download.documentfoundation.org/libreoffice/stable/3.3.4/rpm/%s/LibO_3.3.4_Linux_%s_install-rpm_en-US.tar.gz
url = http://download.documentfoundation.org/libreoffice/stable/3.4.3/rpm/%s/LibO_3.4.3_Linux_%s_install-rpm_en-US.tar.gz
# supported architectures md5sums
md5sum_x86 = ae1b2b387dcef513c378cc95b255affc
md5sum_x86-64 = b2d6a902182c1af82ca088fbb665d0e3
# where office code can be found?
officedir = libreoffice3.4
# script to install
script =
location = %(location)r
self.failIfPathExists(location)
import sys
ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
platform = guessPlatform()
url = self.options['url'] %% (ARCH_DIR_MAP[platform], platform)
md5sum = self.options['md5sum_' + platform]
extract_dir = self.extract(self.download(url, md5sum))
workdir = guessworkdir(extract_dir)
storagedir = os.path.join(workdir, 'storage')
os.mkdir(storagedir)
rpmsdir = os.path.join(workdir, [q for q in os.listdir(workdir) if q == 'RPMS'][0])
rpmlist = [os.path.join(rpmsdir, q) for q in os.listdir(rpmsdir) if q.endswith('.rpm') and 'javafilter' not in q and 'xsltfilter' not in q]
[self.pipeCommand([[sys.executable, '${:rpm2cpio}', rpm], ['${:cpio}', '-idum']], cwd=storagedir) for rpm in rpmlist]
self.copyTree(os.path.join(storagedir, 'opt', '${:officedir}'), location, ['basis3.4', 'basis3.3', 'ure'])
# helper binaries
cpio = ${cpio:location}/bin/cpio
rpm2cpio = ${rpm2cpio:target}
......@@ -4,7 +4,9 @@
[buildout]
extends =
../zlib/buildout.cfg
../groonga/buildout.cfg
../ncurses/buildout.cfg
../pkgconfig/buildout.cfg
../readline/buildout.cfg
parts =
......@@ -21,6 +23,7 @@ keep-compile-dir = true
# - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--disable-static
--enable-thread-safe-client
--enable-local-infile
......@@ -36,3 +39,16 @@ configure-options =
environment =
CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
[groonga-storage-engine-mariadb]
recipe = hexagonit.recipe.cmmi
url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.5.tar.gz
md5sum = 52fed75d97a91f239750a1011ea9e468
configure-options =
--with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
--with-mysql-config=${mariadb:location}/bin/mysql_config
environment =
PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga
LDFLAGS=-L${groonga:location}/lib
PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
# mroonga - a MySQL storage engine using full-text search engine groonga
# http://mroonga.github.com/
# http://groonga.org/
[buildout]
parts =
mroonga
extends =
../mariadb/buildout.cfg
../pkgconfig/buildout.cfg
[groonga]
recipe = hexagonit.recipe.cmmi
url = http://groonga.org/files/groonga/groonga-1.1.0.tar.gz
md5sum = a5a381db446e017f172bf6b003a4fed9
configure-options =
--without-mecab
[mroonga-mariadb-patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
md5sum = da2457b9f8006cddb279a165128479e5
filename = groonga-storage-engine-0.4.mariadb.patch
download-only = true
[mroonga]
recipe = hexagonit.recipe.cmmi
url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.4.tar.gz
md5sum = eb39ddaebb5a295f103bb1f66d5b33da
patch-options = -p1
patches =
${mroonga-mariadb-patch:location}/${mroonga-mariadb-patch:filename}
configure-options =
--with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
--with-mysql-config=${mariadb:location}/bin/mysql_config
environment =
PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga
LDFLAGS=-L${groonga:location}/lib
PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
......@@ -5,8 +5,10 @@ extends =
../zlib/buildout.cfg
../bison/buildout.cfg
../flex/buildout.cfg
../groonga/buildout.cfg
../libtool/buildout.cfg
../ncurses/buildout.cfg
../pkgconfig/buildout.cfg
../readline/buildout.cfg
parts =
......@@ -15,15 +17,15 @@ parts =
[mysql-5.1-sphinx-patch]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
md5sum = 6580393ca93ecf564cad0552b91a563e
filename = mysql-5.1.49-sphinx-1.10.diff
md5sum = eefcd08c400c58d3e89542ab482a8429
filename = mysql-5.1-sphinx-2.0.1-beta.diff
download-only = true
[mysql-5.1]
recipe = hexagonit.recipe.cmmi
version = 5.1.57
version = 5.1.58
url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
md5sum = 8d6998ef0f2e2d1dac2a761348c71c21
md5sum = ae5aef506088e521e4b1cc4f668e96d2
# compile directory is required to build mysql plugins.
keep-compile-dir = true
# configure: how to avoid searching for my.cnf?
......@@ -39,6 +41,7 @@ configure-command =
# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
--disable-static
--enable-thread-safe-client
--enable-local-infile
--enable-assembler
......@@ -54,10 +57,23 @@ configure-options =
make-options =
LIBTOOL=libtool
patch-options = -p1
patch-options = -p0
patches =
${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
environment =
PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
[groonga-storage-engine-mysql-5.1]
recipe = hexagonit.recipe.cmmi
url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-0.9.tar.gz
md5sum = 78fe07122dc376796a5aede476f50cfd
configure-options =
--with-mysql-source=${mysql-5.1:location}__compile__/mysql-${mysql-5.1:version}
--with-mysql-config=${mysql-5.1:location}/bin/mysql_config
environment =
PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga
LDFLAGS=-L${groonga:location}/lib
PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
......@@ -11,11 +11,14 @@ configure-options =
--with-shared
--without-normal
--without-debug
--without-gpm
--enable-rpath
# tricky way to rerun with --enable-widec
make-targets =
install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done) && ./configure ${:configure-options} --enable-widec && make install
# pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
environment =
LDFLAGS =-Wl,--as-needed
LDCONFIG=/bin/echo
make-options =
-j1
......@@ -4,5 +4,5 @@ parts =
[noVNC]
recipe = hexagonit.recipe.download
url = https://github.com/kanaka/noVNC/tarball/v0.1
url = https://github.com/kanaka/noVNC/tarball/master
strip-top-level-dir = true
......@@ -12,8 +12,8 @@ parts =
[openssl]
recipe = hexagonit.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.0d.tar.gz
md5sum = 40b6ea380cc8a5bf9734c2f8bf7e701e
url = https://www.openssl.org/source/openssl-1.0.0e.tar.gz
md5sum = 7040b89c4c58c7a1016c0dfa6e821c86
configure-command = ./config
configure-options =
-I${zlib:location}/include
......
......@@ -39,6 +39,6 @@ make-options =
pre-make-hook = ${pdftk-hooks-download:location}/${pdftk-hooks-download:filename}:pre_make_hook
environment =
PATH=${gcc-java:location}/bin:${fastjar:location}/bin:%(PATH)s
LDFLAGS=-L${gcc-java:location}/lib -Wl,-rpath=${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath=${gcc-java:location}/lib64
LD_LIBRARY_PATH=${gcc-java:location}/lib:${gcc-java:location}/lib64
PATH=${gcc-java-minimal:location}/bin:${fastjar:location}/bin:%(PATH)s
LDFLAGS=-L${gcc-java-minimal:location}/lib -Wl,-rpath=${gcc-java-minimal:location}/lib -L${gcc-java-minimal:location}/lib64 -Wl,-rpath=${gcc-java-minimal:location}/lib64
LD_LIBRARY_PATH=${gcc-java-minimal:location}/lib:${gcc-java-minimal:location}/lib64
......@@ -15,8 +15,8 @@ extends =
[poppler-0.17.1]
recipe = hexagonit.recipe.cmmi
md5sum = 8d7276d1943078c76aabe9f2ec52d50b
url = http://poppler.freedesktop.org/poppler-0.17.1.tar.gz
md5sum = b566d1fbaa29b9257bf0ecc130e7b2ca
url = http://poppler.freedesktop.org/poppler-0.17.2.tar.gz
configure-options =
--disable-cairo-output
--disable-cms
......@@ -26,6 +26,7 @@ configure-options =
--disable-poppler-cpp
--disable-poppler-glib
--disable-poppler-qt4
--disable-static
--enable-zlib
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
......
[buildout]
parts =
rpm2cpio
[rpm2cpio]
recipe = slapos.recipe.build:download
url = http://ruda.googlecode.com/hg/rpm/rpm2cpio.py
md5sum = 06001f57616581312f9599e104f2473a
......@@ -5,8 +5,8 @@ parts =
[sqlite3]
recipe = hexagonit.recipe.cmmi
url = http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz
md5sum = 554026fe7fac47b1cf61c18d5fe43419
url = http://www.sqlite.org/sqlite-autoconf-3070800.tar.gz
md5sum = 6bfb46d73caaa1bbbcd2b52184b6c542
configure-options =
--disable-static
--enable-readline
......
......@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
[stunnel-4]
recipe = hexagonit.recipe.cmmi
url = ftp://ftp.bit.nl/mirror/stunnel/obsolete/4.x/stunnel-4.42.tar.gz
md5sum = f64a7426166d397dd826deef33bb6aa0
url = http://mirror.bit.nl/stunnel/stunnel-4.44.tar.gz
md5sum = c9dd51fc02b913ce5bf7b3fc12f9cb4a
pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
configure-options =
--enable-ipv6
......
......@@ -9,11 +9,6 @@ extends =
parts =
w3m
versions = versions
find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/
[w3m-w3m.gcc.forward.compat.patch]
recipe = hexagonit.recipe.download
url =${:_profile_base_location_}/${:filename}
......@@ -50,7 +45,3 @@ environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/
LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-005
......@@ -2,6 +2,7 @@
[buildout]
extends =
../freetype/buildout.cfg
../libuuid/buildout.cfg
../libxml2/buildout.cfg
../libxslt/buildout.cfg
../pkgconfig/buildout.cfg
......@@ -11,7 +12,8 @@ parts =
libXdmcp
libXext
libXau
libX11
libXinerama
libSM
[xorg-aclocal]
ACLOCAL=${xorg-util-macros:location}/share/aclocal
......@@ -56,8 +58,6 @@ configure-options =
--disable-static
environment =
PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig
LD_LIBRARY_PATH=${xproto:location}/lib
LD_RUN_PATH=${xproto:location}/lib
PATH=${pkgconfig:location}/bin:%(PATH)s
[xcbproto]
......@@ -82,8 +82,6 @@ configure-options =
--disable-build-docs
environment =
PKG_CONFIG_PATH=${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
LD_LIBRARY_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${libxslt:location}/lib
LD_RUN_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${libxslt:location}/lib
PATH=${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
PYTHON=${buildout:executable}
# Python note: libxcb requires python with ElementTree. In case of appliance
......@@ -97,8 +95,6 @@ url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
md5sum = 9bb236ff0193e9fc1c1fb504dd840331
environment =
PKG_CONFIG_PATH=${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
LD_LIBRARY_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
LD_RUN_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
PATH=${pkgconfig:location}/bin:%(PATH)s
# Warning: do *not* enable -fPIC CFLAGS for this library. Even if it fails and ld asks you to enable it. This will not solve your problem, and create an unexpected (by build chain) setup (all .o will be position-independant code).
# CFLAGS=-fPIC
......@@ -113,8 +109,8 @@ patch-options = -p1
[libXext-patch-link-error]
# Fixes libXext.la link error
# http://cgit.freedesktop.org/xorg/lib/libXext/patch/?id=700c7896b832d6e4fb0185f0d5382b01f94e7141
recipe = hexagonit.recipe.download
#url = http://cgit.freedesktop.org/xorg/lib/libXext/patch/?id=700c7896b832d6e4fb0185f0d5382b01f94e7141
url = ${:_profile_base_location_}/${:filename}
download-only = true
filename = 700c7896b832d6e4fb0185f0d5382b01f94e7141.patch
......@@ -134,14 +130,9 @@ configure-options =
--disable-specs
--without-xmlto
--without-fop
environment =
PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig
LD_LIBRARY_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
LD_RUN_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
PATH=${pkgconfig:location}/bin:%(PATH)s
CFLAGS=-I${xproto:location}/include
CPPFLAGS=-I${xproto:location}/include
[libXdmcp]
recipe = hexagonit.recipe.cmmi
......@@ -149,10 +140,48 @@ url = http://www.x.org/releases/X11R7.6/src/lib/libXdmcp-1.1.0.tar.bz2
md5sum = 762b6bbaff7b7d0831ddb4f072f939a5
environment =
PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig
LD_LIBRARY_PATH=${xproto:location}/lib
LD_RUN_PATH=${xproto:location}/lib
PATH=${pkgconfig:location}/bin:%(PATH)s
configure-options =
--disable-static
--without-xmlto
--without-fop
[xineramaproto]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/proto/xineramaproto-1.2.tar.bz2
md5sum = a8aadcb281b9c11a91303e24cdea45f5
[libXinerama]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libXinerama-1.1.1.tar.bz2
md5sum = ecd4839ad01f6f637c6fb5327207f89b
environment =
PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
configure-options =
--disable-static
[libICE]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libICE-1.0.7.tar.bz2
md5sum = bb72a732b15e9dc25c3036559387eed5
configure-options =
--disable-static
--without-xmlto
--without-fop
environment =
PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
[libSM]
recipe = hexagonit.recipe.cmmi
url = http://www.x.org/releases/X11R7.6/src/lib/libSM-1.2.0.tar.bz2
md5sum = e78c447bf1790552b644eca81b542742
configure-options =
--disable-static
--without-xmlto
--without-fop
environment =
PKG_CONFIG_PATH=${libICE:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
PATH=${pkgconfig:location}/bin:%(PATH)s
LIBUUID_CFLAGS=-I${libuuid:location}/include
......@@ -15,11 +15,6 @@ extends =
parts =
xtrabackup
find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/
versions = versions
[xtrabackup-build-patch-download]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/${:filename}
......@@ -51,7 +46,3 @@ environment =
PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
make-options =
-j1
[versions]
# Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-001
This diff is collapsed.
This diff is collapsed.
......@@ -4,3 +4,4 @@ SSLCertificateKeyFile %(login_key)s
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLProxyEngine On
......@@ -9,10 +9,25 @@ defaults
retries 1
option redispatch
maxconn 2000
timeout server 3000s
timeout queue 5s
timeout connect 10s
timeout client 3600s
# it is useless to have timeout much bigger than the one of apache.
# By default apache use 300s, so we set slightly more in order to
# make sure that apache will first stop the connection.
timeout server 305s
# Stop waiting in queue for a zope to become available.
# If no zope can be reached after one minute, consider the request will
# never succeed.
timeout queue 60s
# The connection should be immediate on LAN,
# so we should not set more than 5 seconds, and it could be already too much
timeout connect 5s
# As requested in haproxy doc, make this "at least equal to timeout server".
timeout client 305s
# Use "option httpclose" to not preserve client & server persistent connections
# while handling every incoming request individually, dispatching them one after
# another to servers, in HTTP close mode. This is really needed when haproxy
# is configured with maxconn to 1, without this options browser are unable
# to render a page
option httpclose
listen %(name)s %(ip)s:%(port)s
cookie SERVERID insert
......
CREATE DATABASE IF NOT EXISTS %(mysql_database)s;
GRANT ALL PRIVILEGES ON %(mysql_database)s.* TO %(mysql_user)s@'%%' IDENTIFIED BY '%(mysql_password)s';
GRANT ALL PRIVILEGES ON %(mysql_database)s.* TO %(mysql_user)s@'localhost' IDENTIFIED BY '%(mysql_password)s';
%(file_list)s {
daily
dateext
rotate 3650
compress
notifempty
sharedscripts
......
This diff is collapsed.
# ZEO configuration file generated by SlapOS
<zeo>
address %(zeo_ip)s:%(zeo_port)s
read-only false
invalidation-queue-size 100
pid-filename %(zeo_pid)s
</zeo>
......@@ -10,6 +8,7 @@
<eventlog>
<logfile>
dateformat
path %(zeo_event_log)s
</logfile>
</eventlog>
<zodb_db %(storage_name)s>
cache-size %(zodb_cache_size)d
mount-point %(mount_point)s
<zeoclient>
cache-size %(zeo_client_cache_size)s
server %(address)s
storage %(storage_name)s
name %(storage_name)s
......
<zodb_db root>
cache-size %(zodb_cache_size)d
<filestorage>
path %(zodb_root_path)s
</filestorage>
......
......@@ -7,10 +7,8 @@ instancehome $INSTANCE
# Used products
%(products)s
# Environment override
<environment>
%(environment)s
</environment>
# Environment is setup in running wrapper script
# Reason: zope.conf is read too late for some componets
# No need to debug
debug-mode off
......@@ -34,11 +32,13 @@ lock-filename %(lock-filename)s
# Logging configuration
<eventlog>
<logfile>
dateformat
path %(event_log)s
</logfile>
</eventlog>
<logger access>
<logfile>
dateformat
path %(z2_log)s
</logfile>
</logger>
......
......@@ -83,12 +83,12 @@ class BaseSlapRecipe:
# SLAP related information
slap_connection = buildout['slap_connection']
self.computer_id=slap_connection['computer_id']
self.computer_partition_id=slap_connection['partition_id']
self.server_url=slap_connection['server_url']
self.software_release_url=slap_connection['software_release_url']
self.key_file=slap_connection.get('key_file')
self.cert_file=slap_connection.get('cert_file')
self.computer_id = slap_connection['computer_id']
self.computer_partition_id = slap_connection['partition_id']
self.server_url = slap_connection['server_url']
self.software_release_url = slap_connection['software_release_url']
self.key_file = slap_connection.get('key_file')
self.cert_file = slap_connection.get('cert_file')
# setup egg to give possibility to generate scripts
self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
......
......@@ -31,60 +31,8 @@ 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
SSLVerifyClient require
RequestHeader set REMOTE_USER %%{SSL_CLIENT_S_DN_CN}s
SSLCertificateFile %(key_auth_certificate)s
SSLCertificateKeyFile %(key_auth_key)s
SSLCACertificateFile %(ca_certificate)s
SSLCARevocationPath %(ca_crl)s"""
apache_conf = self._getApacheConfigurationDict('key_auth_apache', ip, port)
apache_conf['ssl_snippet'] = ssl_template % dict(
key_auth_certificate=certificate,
key_auth_key=key,
ca_certificate=ca_conf['ca_certificate'],
ca_crl=ca_conf['ca_crl']
)
prefix = 'ssl_key_auth_apache'
rewrite_rule_template = \
"RewriteRule (.*) http://%(backend)s%(key_auth_path)s$1 [L,P]"
path_template = pkg_resources.resource_string('slapos.recipe.erp5',
'template/apache.zope.conf.path.in')
path = path_template % dict(path='/')
d = dict(
path=path,
backend=backend,
backend_path='/',
port=apache_conf['port'],
vhname=path.replace('/', ''),
key_auth_path=key_auth_path,
)
rewrite_rule = rewrite_rule_template % d
apache_conf.update(**dict(
path_enable=path,
rewrite_rule=rewrite_rule
))
apache_config_file = self.createConfigurationFile(prefix + '.conf',
pkg_resources.resource_string('slapos.recipe.erp5',
'template/apache.zope.conf.in') % apache_conf)
self.path_list.append(apache_config_file)
self.path_list.extend(zc.buildout.easy_install.scripts([(
'key_auth_apache',
'slapos.recipe.erp5.apache', 'runApache')], self.ws,
sys.executable, self.wrapper_directory, arguments=[
dict(
required_path_list=[certificate, key, ca_conf['ca_certificate'],
ca_conf['ca_crl']],
binary=self.options['httpd_binary'],
config=apache_config_file
)
]))
return 'https://%(ip)s:%(port)s' % apache_conf
default_bt5_list = []
def _getZeoClusterDict(self):
site_path = '/erp5/'
......@@ -119,8 +67,8 @@ SSLCARevocationPath %(ca_crl)s"""
self.getTemplateFilename('zope-zeo-snippet.conf.in'), dict(
storage_name=storage_dict['storage_name'],
address='%s:%s' % (storage_dict['ip'], storage_dict['port']),
mount_point=mount_point
)))
mount_point=mount_point, zodb_cache_size=self.zodb_cache_size,
zeo_client_cache_size=self.zeo_client_cache_size)))
tidstorage_config = dict(host=self.getLocalIPv4Address(), port='6001')
zodb_configuration_string = '\n'.join(zodb_configuration_list)
zope_port = 12000
......@@ -150,9 +98,15 @@ SSLCARevocationPath %(ca_crl)s"""
login_url_list)
apache_login = self.installBackendApache(self.getGlobalIPv6Address(), 15000,
login_haproxy, backend_key, backend_certificate)
# Install Frontend
frontend_domain_name = self.parameter_dict.get("domain_name", 'vifib')
frontend_key, frontend_certificate = \
self.requestCertificate(frontend_domain_name)
apache_frontend_login = self.installFrontendZopeApache(
self.getGlobalIPv6Address(), 4443, 'vifib', '/',
apache_login, '/', backend_key, backend_certificate)
self.getGlobalIPv6Address(), 4443, frontend_domain_name, '/',
apache_login, '', frontend_key, frontend_certificate)
# Four Web Service Nodes (Machine access)
service_url_list = []
for i in (1, 2, 3, 4):
......@@ -166,9 +120,9 @@ SSLCARevocationPath %(ca_crl)s"""
key_auth_key, key_auth_certificate = self.requestCertificate(
'Key Based Access')
apache_keyauth = self.installKeyAuthorisationApache(
self.getLocalIPv4Address(), 15500, service_haproxy, key_auth_key,
key_auth_certificate, ca_conf, key_auth_path=self.key_auth_path)
apache_keyauth = self.installKeyAuthorisationApache(False, 15500,
service_haproxy, key_auth_key, key_auth_certificate, ca_conf,
key_auth_path=self.key_auth_path)
memcached_conf = self.installMemcached(ip=self.getLocalIPv4Address(),
port=11000)
kumo_conf = self.installKumo(self.getLocalIPv4Address())
......@@ -179,7 +133,7 @@ SSLCARevocationPath %(ca_crl)s"""
# 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.site_id, self.default_bt5_list, ca_conf)
self.setConnectionDict(dict(
front_end_url=apache_frontend_login,
......@@ -191,12 +145,6 @@ SSLCARevocationPath %(ca_crl)s"""
kumo_url=kumo_conf['kumo_address'],
conversion_server_url='%(conversion_server_ip)s:%(conversion_server_port)s' %
conversion_server_conf,
# openssl binary might be removed, as soon as CP environment will be
# fully controlled
openssl_binary=self.options['openssl_binary'],
# As soon as there would be Vifib ERP5 configuration and possibility to
# call it over the network this can be removed
certificate_authority_path=ca_conf['certificate_authority_path'],
# as installERP5Site is not trusted (yet) and this recipe is production
# ready expose more information
mysql_url='%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s' % mysql_conf,
......@@ -213,13 +161,14 @@ SSLCARevocationPath %(ca_crl)s"""
user, password = self.installERP5()
zodb_dir = os.path.join(self.data_root_directory, 'zodb')
self._createDirectory(zodb_dir)
zodb_root_path = os.path.join(zodb_dir, 'root.fs')
zodb_root_path = os.path.join(zodb_dir, 'main.fs')
ip = self.getLocalIPv4Address()
zope_port = '18080'
zope_access = self.installZope(ip, zope_port, 'zope_development',
zodb_configuration_string=self.substituteTemplate(
self.getTemplateFilename('zope-zodb-snippet.conf.in'),
dict(zodb_root_path=zodb_root_path)),
dict(zodb_root_path=zodb_root_path,
zodb_cache_size=self.zodb_cache_size)),
thread_amount=8, with_timerservice=True)
service_haproxy = self.installHaproxy(ip, 15000, 'service',
self.site_check_path, [zope_access])
......@@ -238,7 +187,7 @@ SSLCARevocationPath %(ca_crl)s"""
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.site_id, self.default_bt5_list, ca_conf)
self.setConnectionDict(dict(
development_zope='http://%s:%s/' % (ip, zope_port),
......@@ -249,12 +198,6 @@ SSLCARevocationPath %(ca_crl)s"""
kumo_url=kumo_conf['kumo_address'],
conversion_server_url='%(conversion_server_ip)s:%(conversion_server_port)s' %
conversion_server_conf,
# openssl binary might be removed, as soon as CP environment will be
# fully controlled
openssl_binary=self.options['openssl_binary'],
# As soon as there would be Vifib ERP5 configuration and possibility to
# call it over the network this can be removed
certificate_authority_path=ca_conf['certificate_authority_path'],
# as installERP5Site is not trusted (yet) and this recipe is production
# ready expose more information
mysql_url='%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s' % mysql_conf,
......@@ -267,6 +210,9 @@ SSLCARevocationPath %(ca_crl)s"""
self.path_list = []
self.requirements, self.ws = self.egg.working_set()
# self.cron_d is a directory, where cron jobs can be registered
self.zodb_cache_size = int(self.options.get('zodb_cache_size', 5000))
self.zeo_client_cache_size = self.options.get('zeo_client_cache_size',
'20MB')
self.cron_d = self.installCrond()
self.logrotate_d, self.logrotate_backup = self.installLogrotate()
self.killpidfromfile = zc.buildout.easy_install.scripts(
......@@ -276,8 +222,6 @@ SSLCARevocationPath %(ca_crl)s"""
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':
return self.installProduction()
raise NotImplementedError('Flavour of instance have to be given.')
return self.installDevelopment()
K 25
svn:wc:ra_dav:version-url
V 101
/repos/public/!svn/ver/45235/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template
END
my.cnf.in
K 25
svn:wc:ra_dav:version-url
V 111
/repos/public/!svn/ver/45235/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template/my.cnf.in
END
tomcat-server.xml.in
K 25
svn:wc:ra_dav:version-url
V 122
/repos/public/!svn/ver/45235/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template/tomcat-server.xml.in
END
mysqld.bin
K 25
svn:wc:ra_dav:version-url
V 112
/repos/public/!svn/ver/45235/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template/mysqld.bin
END
hibernate.cfg.xml.in
K 25
svn:wc:ra_dav:version-url
V 122
/repos/public/!svn/ver/45235/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template/hibernate.cfg.xml.in
END
initmysql.sql.in
K 25
svn:wc:ra_dav:version-url
V 118
/repos/public/!svn/ver/45235/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template/initmysql.sql.in
END
10
dir
45492
https://svn.erp5.org/repos/public/slapos/trunk/recipe/slapos.recipe.xwiki/src/slapos/recipe/xwiki/template
https://svn.erp5.org/repos/public
2011-04-08T10:52:53.516084Z
45235
luke
20353a03-c40f-0410-a6d1-a30d3c3de9de
my.cnf.in
file
2011-04-15T12:07:28.105799Z
4e14aadbd4cc702f79be73d30e43910a
2011-04-08T10:52:53.516084Z
45235
luke
1748
tomcat-server.xml.in
file
2011-04-15T12:07:28.106799Z
e2f38e13d03651be5e315648486d5037
2011-04-08T10:52:53.516084Z
45235
luke
6832
mysqld.bin
file
2011-04-15T12:07:28.106799Z
c8d25b8de5d48ec743ef96765510295c
2011-04-08T10:52:53.516084Z
45235
luke
70
hibernate.cfg.xml.in
file
2011-04-15T12:07:28.106799Z
6b232131d3aa1cf19c9b1bf07db98aaf
2011-04-08T10:52:53.516084Z
45235
luke
7107
initmysql.sql.in
file
2011-04-15T12:07:28.106799Z
0b2a21fe9fb6578bfa7756978cabd26e
2011-04-08T10:52:53.516084Z
45235
luke
129
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory>
<!-- Please refer to the installation guide on
http://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
database. You'll need to do 2 things:
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
2) Uncomment the properties below for your specific DB (and comment the default
database configuration if it doesn't match your DB)
-->
<!-- Generic parameters common to all Databases -->
<property name="show_sql">false</property>
<property name="use_outer_join">true</property>
<property name="dbcp.defaultAutoCommit">false</property>
<property name="dbcp.maxActive">50</property>
<property name="dbcp.maxIdle">5</property>
<property name="dbcp.maxWait">30000</property>
<property name="dbcp.whenExhaustedAction">1</property>
<property name="dbcp.ps.whenExhaustedAction">1</property>
<property name="dbcp.ps.maxActive">20</property>
<property name="dbcp.ps.maxWait">120000</property>
<property name="dbcp.ps.maxIdle">20</property>
<!-- Without it, some queries fail in MS SQL. XWiki doesn't need scrollable result sets, anyway. -->
<property name="jdbc.use_scrollable_resultset">false</property>
<!-- Configuration for the default database.
Comment out this section and uncomment other sections below if you want to use another database.
Note that the database tables will be created automatically if they don't already exist.
<property name="connection.url">jdbc:hsqldb:file:database/xwiki_db;shutdown=true</property>
<property name="connection.username">sa</property>
<property name="connection.password"></property>
<property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
<property name="dialect">org.hibernate.dialect.HSQLDialect</property>
<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
<property name="connection.pool_size">2</property>
<property name="statement_cache.size">2</property>
<mapping resource="xwiki.hbm.xml"/>
<mapping resource="feeds.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-->
<!-- MySQL configuration.
Uncomment if you want to use MySQL and comment out other database configurations.
We need to set the sql_mode to a less strict value, see XWIKI-1945
-->
<property name="connection.url">jdbc:mysql://%(mysql_ip)s:%(mysql_port)s/xwiki?useServerPrepStmts=false&amp;useUnicode=true&amp;characterEncoding=UTF-8&amp;sessionVariables=sql_mode=''</property>
<property name="connection.username">xwiki</property>
<property name="connection.password">xwiki</property>
<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
<property name="connection.pool_size">2</property>
<property name="statement_cache.size">2</property>
<mapping resource="xwiki.hbm.xml"/>
<mapping resource="feeds.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
<!-- HSQLDB configuration.
Uncomment if you want to use HSQLDB and comment out other database configurations.
<property name="connection.url">jdbc:hsqldb:file:/some/path/xwikidb;shutdown=true</property>
<property name="connection.username">sa</property>
<property name="connection.password"></property>
<property name="connection.driver_class">org.hsqldb.jdbcDriver</property>
<property name="dialect">org.hibernate.dialect.HSQLDialect</property>
<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
<property name="connection.pool_size">2</property>
<property name="statement_cache.size">2</property>
<mapping resource="xwiki.hbm.xml"/>
<mapping resource="feeds.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-->
<!-- PostgreSQL configuration.
Uncomment if you want to use PostgreSQL and comment out other database configurations.
<property name="connection.url">jdbc:postgresql:xwiki</property>
<property name="connection.username">xwiki</property>
<property name="connection.password">xwiki</property>
<property name="connection.driver_class">org.postgresql.Driver</property>
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
<property name="connection.pool_size">2</property>
<property name="statement_cache.size">2</property>
<mapping resource="xwiki.hbm.xml"/>
<mapping resource="feeds.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-->
<!-- Oracle configuration.
Uncomment if you want to use Oracle and comment out other database configurations.
Note: the 2 properties named "hibernate.connection.SetBigStringTryClob" and
"hibernate.jdbc.batch_size". They are required to tell Oracle to allow CLOBs larger than
32K.
<property name="connection.url">jdbc:oracle:thin:@localhost:1521:XE</property>
<property name="connection.username">xwiki</property>
<property name="connection.password">xwiki</property>
<property name="connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
<property name="dialect">org.hibernate.dialect.Oracle10gDialect</property>
<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
<property name="connection.pool_size">2</property>
<property name="statement_cache.size">2</property>
<property name="hibernate.connection.SetBigStringTryClob">true</property>
<property name="hibernate.jdbc.batch_size">0</property>
<mapping resource="xwiki.oracle.hbm.xml"/>
<mapping resource="feeds.oracle.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-->
<!-- Derby configuration.
Uncomment if you want to use Derby and comment out other database configurations.
<property name="connection.url">jdbc:derby:/some/path/xwikidb;create=true</property>
<property name="connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property>
<property name="dialect">org.hibernate.dialect.DerbyDialect</property>
<property name="connection.provider_class">com.xpn.xwiki.store.DBCPConnectionProvider</property>
<property name="connection.pool_size">2</property>
<property name="statement_cache.size">2</property>
<mapping resource="xwiki.derby.hbm.xml"/>
<mapping resource="feeds.hbm.xml"/>
<mapping resource="activitystream.hbm.xml"/>
-->
</session-factory>
</hibernate-configuration>
CREATE DATABASE IF NOT EXISTS xwiki;
GRANT ALL PRIVILEGES ON %(database)s.* TO %(user)s@'%%' IDENTIFIED BY '%(password)s';
EXIT
# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
# The MySQL server
[mysqld]
# ERP5 by default requires InnoDB storage. MySQL by default fallbacks to using
# different engine, like MyISAM. Such behaviour generates problems only, when
# tables requested as InnoDB are silently created with MyISAM engine.
#
# Loud fail is really required in such case.
sql-mode="NO_ENGINE_SUBSTITUTION"
skip-show-database
port = %(tcp_port)s
bind-address = %(ip)s
socket = %(socket)s
datadir = %(data_directory)s
pid-file = %(pid_file)s
log-error = %(error_log)s
log-slow-queries = %(slow_query_log)s
long_query_time = 5
skip-locking
key_buffer = 384M
max_allowed_packet = 128M
table_cache = 512
sort_buffer_size = 2M
read_buffer_size = 2M
read_rnd_buffer_size = 8M
myisam_sort_buffer_size = 64M
thread_cache_size = 8
query_cache_size = 32M
# Try number of CPU's*2 for thread_concurrency
thread_concurrency = 8
# Disable Federated by default
skip-federated
# Replication Master Server (default)
# binary logging is required for replication
log-bin=mysql-bin
# required unique id between 1 and 2^32 - 1
# defaults to 1 if master-host is not set
# but will not function as a master if omitted
server-id = 1
# Force utf8 usage
collation_server = utf8_unicode_ci
character_set_server = utf8
default-character-set = utf8
skip-character-set-client-handshake
[mysqldump]
quick
max_allowed_packet = 16M
[mysql]
no-auto-rehash
# Remove the next comment character if you are not familiar with SQL
#safe-updates
socket = %(socket)s
[isamchk]
key_buffer = 256M
sort_buffer_size = 256M
read_buffer = 2M
write_buffer = 2M
[myisamchk]
key_buffer = 256M
sort_buffer_size = 256M
read_buffer = 2M
write_buffer = 2M
[mysqlhotcopy]
interactive-timeout
#!/bin/sh
exec %(real_binary)s --defaults-file=%(configuration_file)s
<?xml version='1.0' encoding='utf-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
<Server port="-1" shutdown="SHUTDOWN">
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
<Listener className="org.apache.catalina.core.JasperListener" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
-->
<GlobalNamingResources>
<!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users
-->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
Documentation at /docs/config/service.html
-->
<Service name="Catalina">
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
<!--
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
-->
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
<Connector address="%(http_address)s" port="%(http_port)s" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
<!--
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector address="%(ajp_address)s" port="%(ajp_port)s" protocol="AJP/1.3" redirectPort="8443" />
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host).
Documentation at /docs/config/engine.html -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">
<!--For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
/docs/config/cluster.html (reference documentation) -->
<!--
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->
<!-- The request dumper valve dumps useful debugging information about
the request and response data received and sent by Tomcat.
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-->
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
<!-- Define the default virtual host
Note: XML Schema validation will not work with Xerces 2.2.
-->
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">
<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->
<!-- Access log processes all example.
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
-->
</Host>
</Engine>
</Service>
</Server>
This diff is collapsed.
......@@ -229,3 +229,5 @@ ListenIP=%(ip)s
# Mandatory: no
# Default:
# UserParameter=
%(user_parameter_string)s
......@@ -23,4 +23,4 @@ link_binary_list =
${pdftk:location}/bin/pdftk
environment =
LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib
LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib:${zlib:location}/lib
......@@ -33,6 +33,6 @@ module = cloudooo
# Default template for erp5 instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum = 45d8de2ca15f126506ad5c08357c5a26
md5sum = 2a38a928deb5870e02a8271b34341f5b
output = ${buildout:directory}/template.cfg
mode = 0644
......@@ -29,10 +29,11 @@ runTestSuite_binary = ${buildout:bin-directory}/runTestSuite
runUnitTest_binary = ${buildout:bin-directory}/runUnitTest
runzeo_binary = ${buildout:bin-directory}/runzeo
runzope_binary = ${buildout:bin-directory}/runzope
sphinx_searchd_binary = ${sphinx:location}/bin/searchd
tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent
zabbix_agentd_binary = ${zabbix-agent:location}/sbin/zabbix_agentd
mk-variable-advisor_binary = ${perl:siteprefix}/bin/mk-variable-advisor
mk-table-usage_binary = ${perl:siteprefix}/bin/mk-table-usage
mk-visual-explain_binary = ${perl:siteprefix}/bin/mk-visual-explain
......@@ -74,7 +75,7 @@ link_binary_list =
# availability in software's eggs
products = ${products:list}
environment =
LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib
LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib:${zlib:location}/lib
bt5_repository_list = ${bt5-repository:list}
......
This diff is collapsed.
......@@ -20,7 +20,8 @@ repository_id_list += vifib/master
[vifib]
<= erp5
repository = http://git.erp5.org/repos/slapos.core.git
revision = 3f766ab93c5312c75b7315a60238c1c5b3e4170d
# tag: vifib-0.2
revision = f42ad28f0aa47d8cdb028ce6a1796eb7ef6f066e
[local-bt5-repository]
# XXX: workaround for zc.buildout bug, as list += ends up with adding new entry
......
......@@ -30,7 +30,8 @@ parts =
libXdmcp
libXext
libXau
libX11
libXinerama
libSM
# fonts
liberation-fonts
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment