merge with master

8f6c51e9 · Priscila Manhaes · 2fcbb362 · 8f6c51e9 · 8f6c51e9 · 8f6c51e9
Commit 8f6c51e9 authored Jul 15, 2011 by Priscila Manhaes
361 changed files
--- a/.gitignore
+++ b/.gitignore
--- a/CHANGES.txt
+++ b/CHANGES.txt
--- a/MANIFEST.in
+++ b/MANIFEST.in
--- a/README.txt
+++ b/README.txt
--- a/component/apache-php/buildout.cfg
+++ b/component/apache-php/buildout.cfg
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
--- a/component/autoconf/buildout.cfg
+++ b/component/autoconf/buildout.cfg
--- a/component/automake/buildout.cfg
+++ b/component/automake/buildout.cfg
--- a/component/bison/buildout.cfg
+++ b/component/bison/buildout.cfg
--- a/component/boost-lib/buildout.cfg
+++ b/component/boost-lib/buildout.cfg
--- a/component/bzip2/buildout.cfg
+++ b/component/bzip2/buildout.cfg
--- a/component/bzip2/bzip2-hooks.py
+++ b/component/bzip2/bzip2-hooks.py
--- a/component/ccache/buildout.cfg
+++ b/component/ccache/buildout.cfg
--- a/component/cloudooo/buildout.cfg
+++ b/component/cloudooo/buildout.cfg
--- a/component/cmake/buildout.cfg
+++ b/component/cmake/buildout.cfg
--- a/component/coreutils/buildout.cfg
+++ b/component/coreutils/buildout.cfg
--- a/component/cpio/buildout.cfg
+++ b/component/cpio/buildout.cfg
--- a/component/cuneiform/buildout.cfg
+++ b/component/cuneiform/buildout.cfg
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
--- a/component/cyrus-sasl/buildout.cfg
+++ b/component/cyrus-sasl/buildout.cfg
--- a/component/cyrus-sasl/cyrus-sasl-2.1.22-gcc44.patch
+++ b/component/cyrus-sasl/cyrus-sasl-2.1.22-gcc44.patch
--- a/component/cyrus-sasl/cyrus-sasl-prototype-declaration.patch
+++ b/component/cyrus-sasl/cyrus-sasl-prototype-declaration.patch
--- a/component/dcron/buildout.cfg
+++ b/component/dcron/buildout.cfg
--- a/component/dcron/dcron-4.4.noroot.no.globals.patch
+++ b/component/dcron/dcron-4.4.noroot.no.globals.patch
--- a/component/fastjar/buildout.cfg
+++ b/component/fastjar/buildout.cfg
--- a/component/ffmpeg/buildout.cfg
+++ b/component/ffmpeg/buildout.cfg
--- a/component/file/buildout.cfg
+++ b/component/file/buildout.cfg
--- a/component/flare/buildout.cfg
+++ b/component/flare/buildout.cfg
--- a/component/flex/buildout.cfg
+++ b/component/flex/buildout.cfg
--- a/component/fontconfig/buildout.cfg
+++ b/component/fontconfig/buildout.cfg
--- a/component/fonts/buildout.cfg
+++ b/component/fonts/buildout.cfg
--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
--- a/component/garbage-collector/buildout.cfg
+++ b/component/garbage-collector/buildout.cfg
--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
--- a/component/gdbm/buildout.cfg
+++ b/component/gdbm/buildout.cfg
--- a/component/gdbm/gdbm-Makefile.in-nochange.patch
+++ b/component/gdbm/gdbm-Makefile.in-nochange.patch
--- a/component/gettext/buildout.cfg
+++ b/component/gettext/buildout.cfg
--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
--- a/component/ghostscript/ghostscript-hooks.py
+++ b/component/ghostscript/ghostscript-hooks.py
--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
--- a/component/graphviz/buildout.cfg
+++ b/component/graphviz/buildout.cfg
--- a/component/grep/buildout.cfg
+++ b/component/grep/buildout.cfg
--- a/component/gzip/buildout.cfg
+++ b/component/gzip/buildout.cfg
--- a/component/handlersocket/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch
+++ b/component/handlersocket/HandlerSocket-Plugin-for-MySQL-1.0.6-mariadb.patch
--- a/component/handlersocket/buildout.cfg
+++ b/component/handlersocket/buildout.cfg
--- a/component/haproxy/buildout.cfg
+++ b/component/haproxy/buildout.cfg
--- a/component/hookbox/buildout.cfg
+++ b/component/hookbox/buildout.cfg
--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
--- a/component/imagemagick/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
+++ b/component/imagemagick/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
--- a/component/imagemagick/imagemagick-6.6.7-4-without-lzma.patch
+++ b/component/imagemagick/imagemagick-6.6.7-4-without-lzma.patch
--- a/component/jasper/buildout.cfg
+++ b/component/jasper/buildout.cfg
--- a/component/jbigkit/buildout.cfg
+++ b/component/jbigkit/buildout.cfg
--- a/component/jbigkit/jbigkit-2.0-build.patch
+++ b/component/jbigkit/jbigkit-2.0-build.patch
--- a/component/jbigkit/jbigkit-hooks.py
+++ b/component/jbigkit/jbigkit-hooks.py
--- a/component/kumo/buildout.cfg
+++ b/component/kumo/buildout.cfg
--- a/component/kumo/kumo-hooks.py
+++ b/component/kumo/kumo-hooks.py
--- a/component/kumo/kumofs-0.4.13_ipv6support_multiiplistenfix.patch
+++ b/component/kumo/kumofs-0.4.13_ipv6support_multiiplistenfix.patch
--- a/component/libdb/buildout.cfg
+++ b/component/libdb/buildout.cfg
--- a/component/libdb/libdb-hooks.py
+++ b/component/libdb/libdb-hooks.py
--- a/component/libevent/buildout.cfg
+++ b/component/libevent/buildout.cfg
--- a/component/libexpat/buildout.cfg
+++ b/component/libexpat/buildout.cfg
--- a/component/libjpeg/buildout.cfg
+++ b/component/libjpeg/buildout.cfg
--- a/component/libpng/buildout.cfg
+++ b/component/libpng/buildout.cfg
--- a/component/libreoffice-bin/buildout.cfg
+++ b/component/libreoffice-bin/buildout.cfg
@@ -19,6 +19,6 @@ install-pyuno-egg = no
 hack-openoffice-python = no
 flavour = libreoffice
 # 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/old/stable/3.3.2/rpm/%s/LibO_3.3.2_Linux_%s_install-rpm_en-US.tar.gz

 cpio = ${cpio:location}/bin/cpio
--- a/component/librsync/buildout.cfg
+++ b/component/librsync/buildout.cfg
--- a/component/libtiff/buildout.cfg
+++ b/component/libtiff/buildout.cfg
--- a/component/libtool/buildout.cfg
+++ b/component/libtool/buildout.cfg
--- a/component/libuuid/buildout.cfg
+++ b/component/libuuid/buildout.cfg
--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
--- a/component/logrotate/buildout.cfg
+++ b/component/logrotate/buildout.cfg
--- a/component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch
+++ b/component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch
--- a/component/lxml-python/buildout.cfg
+++ b/component/lxml-python/buildout.cfg
--- a/component/lynx/buildout.cfg
+++ b/component/lynx/buildout.cfg
--- a/component/m2crypto/buildout.cfg
+++ b/component/m2crypto/buildout.cfg
--- a/component/m4/buildout.cfg
+++ b/component/m4/buildout.cfg
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
--- a/component/memcached/buildout.cfg
+++ b/component/memcached/buildout.cfg
--- a/component/memcached/memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
+++ b/component/memcached/memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
--- a/component/memcached/memcached-fix-strict-aliasing.patch
+++ b/component/memcached/memcached-fix-strict-aliasing.patch
--- a/component/memcached/memcached-gcc4.6.patch
+++ b/component/memcached/memcached-gcc4.6.patch
--- a/component/messagepack/buildout.cfg
+++ b/component/messagepack/buildout.cfg
--- a/component/mroonga/buildout.cfg
+++ b/component/mroonga/buildout.cfg
--- a/component/mroonga/groonga-storage-engine-0.4.mariadb.patch
+++ b/component/mroonga/groonga-storage-engine-0.4.mariadb.patch
--- a/component/mysql-5.1/buildout.cfg
+++ b/component/mysql-5.1/buildout.cfg
--- a/component/mysql-5.1/mysql-5.1.49-sphinx-1.10.diff
+++ b/component/mysql-5.1/mysql-5.1.49-sphinx-1.10.diff
--- a/component/mysql-python/buildout.cfg
+++ b/component/mysql-python/buildout.cfg
--- a/component/mysql-tritonn-5.0/buildout.cfg
+++ b/component/mysql-tritonn-5.0/buildout.cfg
--- a/component/mysql-tritonn-5.0/mysql-5.0.87-sphinx-1.10.diff
+++ b/component/mysql-tritonn-5.0/mysql-5.0.87-sphinx-1.10.diff
--- a/component/ncurses/buildout.cfg
+++ b/component/ncurses/buildout.cfg
--- a/component/neon/buildout.cfg
+++ b/component/neon/buildout.cfg
--- a/component/noVNC/buildout.cfg
+++ b/component/noVNC/buildout.cfg
--- a/component/nullmailer/buildout.cfg
+++ b/component/nullmailer/buildout.cfg
--- a/component/ocropus/buildout.cfg
+++ b/component/ocropus/buildout.cfg
--- a/component/oood/buildout.cfg
+++ b/component/oood/buildout.cfg
--- a/component/openldap/buildout.cfg
+++ b/component/openldap/buildout.cfg
--- a/component/openoffice-bin/buildout.cfg
+++ b/component/openoffice-bin/buildout.cfg
--- a/component/openoffice/buildout.cfg
+++ b/component/openoffice/buildout.cfg
--- a/component/opensp/buildout.cfg
+++ b/component/opensp/buildout.cfg
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
--- a/component/patch/buildout.cfg
+++ b/component/patch/buildout.cfg
--- a/component/pcre/buildout.cfg
+++ b/component/pcre/buildout.cfg
--- a/component/pdftk/buildout.cfg
+++ b/component/pdftk/buildout.cfg
--- a/component/pdftk/pdftk-1.44-Makefile.Base.patch
+++ b/component/pdftk/pdftk-1.44-Makefile.Base.patch
--- a/component/pdftk/pdftk-hooks.py
+++ b/component/pdftk/pdftk-hooks.py
--- a/component/perl-Class-Accessor/buildout.cfg
+++ b/component/perl-Class-Accessor/buildout.cfg
--- a/component/perl-Config-General/buildout.cfg
+++ b/component/perl-Config-General/buildout.cfg
--- a/component/perl-Encode-HanExtra/buildout.cfg
+++ b/component/perl-Encode-HanExtra/buildout.cfg
--- a/component/perl-HTML-Encoding/buildout.cfg
+++ b/component/perl-HTML-Encoding/buildout.cfg
--- a/component/perl-HTML-Parser/buildout.cfg
+++ b/component/perl-HTML-Parser/buildout.cfg
--- a/component/perl-HTML-Tagset/buildout.cfg
+++ b/component/perl-HTML-Tagset/buildout.cfg
--- a/component/perl-HTML-Template/buildout.cfg
+++ b/component/perl-HTML-Template/buildout.cfg
--- a/component/perl-JSON/buildout.cfg
+++ b/component/perl-JSON/buildout.cfg
--- a/component/perl-Net-IP/buildout.cfg
+++ b/component/perl-Net-IP/buildout.cfg
--- a/component/perl-SGML-Parser-OpenSP/buildout.cfg
+++ b/component/perl-SGML-Parser-OpenSP/buildout.cfg
--- a/component/perl-URI/buildout.cfg
+++ b/component/perl-URI/buildout.cfg
--- a/component/perl-XML-LibXML/buildout.cfg
+++ b/component/perl-XML-LibXML/buildout.cfg
--- a/component/perl-XML-NamespaceSupport/buildout.cfg
+++ b/component/perl-XML-NamespaceSupport/buildout.cfg
--- a/component/perl-XML-SAX/buildout.cfg
+++ b/component/perl-XML-SAX/buildout.cfg
--- a/component/perl-libwww-perl/buildout.cfg
+++ b/component/perl-libwww-perl/buildout.cfg
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
--- a/component/perl/perl-keep-linker-flags-in-ldflags.patch
+++ b/component/perl/perl-keep-linker-flags-in-ldflags.patch
--- a/component/pkgconfig/buildout.cfg
+++ b/component/pkgconfig/buildout.cfg
--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
--- a/component/popt/buildout.cfg
+++ b/component/popt/buildout.cfg
--- a/component/postfix/buildout.cfg
+++ b/component/postfix/buildout.cfg
--- a/component/pysvn-python/buildout.cfg
+++ b/component/pysvn-python/buildout.cfg
--- a/component/python-2.4/buildout.cfg
+++ b/component/python-2.4/buildout.cfg
--- a/component/python-2.4/python2.4-backport-CPPFLAGS-setup-from-python2.6.patch
+++ b/component/python-2.4/python2.4-backport-CPPFLAGS-setup-from-python2.6.patch
--- a/component/python-2.4/python2.4-no_system_inc_dirs.patch
+++ b/component/python-2.4/python2.4-no_system_inc_dirs.patch
--- a/component/python-2.6/buildout.cfg
+++ b/component/python-2.6/buildout.cfg
--- a/component/python-2.6/python-2.6.6-no_system_inc_dirs.patch
+++ b/component/python-2.6/python-2.6.6-no_system_inc_dirs.patch
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
--- a/component/python-ldap-python/buildout.cfg
+++ b/component/python-ldap-python/buildout.cfg
--- a/component/rdiff-backup/buildout.cfg
+++ b/component/rdiff-backup/buildout.cfg
--- a/component/readline/buildout.cfg
+++ b/component/readline/buildout.cfg
--- a/component/sed/buildout.cfg
+++ b/component/sed/buildout.cfg
--- a/component/serf/buildout.cfg
+++ b/component/serf/buildout.cfg
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
--- a/component/sphinx/buildout.cfg
+++ b/component/sphinx/buildout.cfg
--- a/component/sphinx/sphinx-1.10-beta-snowball.patch
+++ b/component/sphinx/sphinx-1.10-beta-snowball.patch
--- a/component/sphinx/sphinx-1.10-fix_nosigpipe.patch
+++ b/component/sphinx/sphinx-1.10-fix_nosigpipe.patch
--- a/component/sqlite3/buildout.cfg
+++ b/component/sqlite3/buildout.cfg
--- a/component/stunnel/buildout.cfg
+++ b/component/stunnel/buildout.cfg
--- a/component/stunnel/stunnel-4-hooks.py
+++ b/component/stunnel/stunnel-4-hooks.py
--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
--- a/component/subversion/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch
+++ b/component/subversion/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch
--- a/component/swig/buildout.cfg
+++ b/component/swig/buildout.cfg
--- a/component/tesseract/buildout.cfg
+++ b/component/tesseract/buildout.cfg
--- a/component/tokyocabinet/buildout.cfg
+++ b/component/tokyocabinet/buildout.cfg
--- a/component/varnish/buildout.cfg
+++ b/component/varnish/buildout.cfg
--- a/component/w3-validator/buildout.cfg
+++ b/component/w3-validator/buildout.cfg
--- a/component/w3m/buildout.cfg
+++ b/component/w3m/buildout.cfg
--- a/component/w3m/w3m.gcc.forward.compat.patch
+++ b/component/w3m/w3m.gcc.forward.compat.patch
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
--- a/component/xpdf/buildout.cfg
+++ b/component/xpdf/buildout.cfg
--- a/component/xtrabackup/allow_force_ibbackup.patch
+++ b/component/xtrabackup/allow_force_ibbackup.patch
--- a/component/xtrabackup/buildout.cfg
+++ b/component/xtrabackup/buildout.cfg
--- a/component/xtrabackup/xtrabackup_build.patch
+++ b/component/xtrabackup/xtrabackup_build.patch
--- a/component/zabbix/buildout.cfg
+++ b/component/zabbix/buildout.cfg
--- a/component/zip/buildout.cfg
+++ b/component/zip/buildout.cfg
--- a/component/zlib/buildout.cfg
+++ b/component/zlib/buildout.cfg
--- a/component/zope-2.12/buildout.cfg
+++ b/component/zope-2.12/buildout.cfg
--- a/component/zope-2.8/buildout.cfg
+++ b/component/zope-2.8/buildout.cfg
--- a/setup.py
+++ b/setup.py
--- a/slapos/__init__.py
+++ b/slapos/__init__.py
--- a/slapos/recipe/README.cloudooo.txt
+++ b/slapos/recipe/README.cloudooo.txt
--- a/slapos/recipe/README.download.txt
+++ b/slapos/recipe/README.download.txt
--- a/slapos/recipe/README.erp5.txt
+++ b/slapos/recipe/README.erp5.txt
--- a/slapos/recipe/README.erp5testnode.txt
+++ b/slapos/recipe/README.erp5testnode.txt
--- a/slapos/recipe/README.helloworld.txt
+++ b/slapos/recipe/README.helloworld.txt
--- a/slapos/recipe/README.java.txt
+++ b/slapos/recipe/README.java.txt
--- a/slapos/recipe/README.kumofs.txt
+++ b/slapos/recipe/README.kumofs.txt
--- a/slapos/recipe/README.kvm.txt
+++ b/slapos/recipe/README.kvm.txt
--- a/slapos/recipe/README.libcloud.txt
+++ b/slapos/recipe/README.libcloud.txt
--- a/slapos/recipe/README.libcloudrequest.txt
+++ b/slapos/recipe/README.libcloudrequest.txt
--- a/slapos/recipe/README.librecipe.txt
+++ b/slapos/recipe/README.librecipe.txt
--- a/slapos/recipe/README.memcached.txt
+++ b/slapos/recipe/README.memcached.txt
--- a/slapos/recipe/README.mysql.txt
+++ b/slapos/recipe/README.mysql.txt
--- a/slapos/recipe/README.nbdserver.txt
+++ b/slapos/recipe/README.nbdserver.txt
--- a/slapos/recipe/README.nosqltestbed.txt
+++ b/slapos/recipe/README.nosqltestbed.txt
--- a/slapos/recipe/README.proactive.txt
+++ b/slapos/recipe/README.proactive.txt
--- a/slapos/recipe/README.sheepdogtestbed.txt
+++ b/slapos/recipe/README.sheepdogtestbed.txt
--- a/slapos/recipe/README.siptester.txt
+++ b/slapos/recipe/README.siptester.txt
--- a/slapos/recipe/README.slaprunner.txt
+++ b/slapos/recipe/README.slaprunner.txt
--- a/slapos/recipe/README.testnode.txt
+++ b/slapos/recipe/README.testnode.txt
--- a/slapos/recipe/README.vifib.txt
+++ b/slapos/recipe/README.vifib.txt
--- a/slapos/recipe/README.xwiki.txt
+++ b/slapos/recipe/README.xwiki.txt
--- a/slapos/recipe/README.zabbixagent.txt
+++ b/slapos/recipe/README.zabbixagent.txt
--- a/slapos/recipe/__init__.py
+++ b/slapos/recipe/__init__.py
--- a/slapos/recipe/cloudooo/__init__.py
+++ b/slapos/recipe/cloudooo/__init__.py
--- a/slapos/recipe/cloudooo/openssl.cnf.ca.in
+++ b/slapos/recipe/cloudooo/openssl.cnf.ca.in
--- a/slapos/recipe/cloudooo/stunnel.conf.in
+++ b/slapos/recipe/cloudooo/stunnel.conf.in
--- a/slapos/recipe/cloudooo/cloudooo.cfg.in
+++ b/slapos/recipe/cloudooo/cloudooo.cfg.in
--- a/slapos/recipe/cloudooo/testrunner.py
+++ b/slapos/recipe/cloudooo/testrunner.py
--- a/slapos/recipe/download.py
+++ b/slapos/recipe/download.py
--- a/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/__init__.py
--- a/slapos/recipe/erp5/apache.py
+++ b/slapos/recipe/erp5/apache.py
--- a/slapos/recipe/erp5/catdatefile.py
+++ b/slapos/recipe/erp5/catdatefile.py
--- a/slapos/recipe/erp5/certificate_authority.py
+++ b/slapos/recipe/erp5/certificate_authority.py
--- a/slapos/recipe/erp5/erp5.py
+++ b/slapos/recipe/erp5/erp5.py
--- a/slapos/recipe/erp5/innobackupex.py
+++ b/slapos/recipe/erp5/innobackupex.py
--- a/slapos/recipe/erp5/killpidfromfile.py
+++ b/slapos/recipe/erp5/killpidfromfile.py
--- a/slapos/recipe/erp5/mysql.py
+++ b/slapos/recipe/erp5/mysql.py
--- a/slapos/recipe/erp5/template/apache.location-snippet.conf.in
+++ b/slapos/recipe/erp5/template/apache.location-snippet.conf.in
--- a/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
+++ b/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
--- a/slapos/recipe/erp5/template/apache.zope.conf.in
+++ b/slapos/recipe/erp5/template/apache.zope.conf.in
--- a/slapos/recipe/erp5/template/apache.zope.conf.path-protected.in
+++ b/slapos/recipe/erp5/template/apache.zope.conf.path-protected.in
--- a/slapos/recipe/erp5/template/apache.zope.conf.path.in
+++ b/slapos/recipe/erp5/template/apache.zope.conf.path.in
--- a/slapos/recipe/erp5/template/cloudooo.cfg.in
+++ b/slapos/recipe/erp5/template/cloudooo.cfg.in
--- a/slapos/recipe/erp5/template/haproxy.cfg.in
+++ b/slapos/recipe/erp5/template/haproxy.cfg.in
--- a/slapos/recipe/erp5/template/initmysql.sql.in
+++ b/slapos/recipe/erp5/template/initmysql.sql.in
--- a/slapos/recipe/erp5/template/kumo_gateway.in
+++ b/slapos/recipe/erp5/template/kumo_gateway.in
--- a/slapos/recipe/erp5/template/kumo_manager.in
+++ b/slapos/recipe/erp5/template/kumo_manager.in
--- a/slapos/recipe/erp5/template/kumo_server.in
+++ b/slapos/recipe/erp5/template/kumo_server.in
--- a/slapos/recipe/erp5/template/logrotate_entry.in
+++ b/slapos/recipe/erp5/template/logrotate_entry.in
--- a/slapos/recipe/erp5/template/memcached.in
+++ b/slapos/recipe/erp5/template/memcached.in
--- a/slapos/recipe/erp5/template/my.cnf.in
+++ b/slapos/recipe/erp5/template/my.cnf.in
--- a/slapos/recipe/erp5/template/openssl.cnf.ca.in
+++ b/slapos/recipe/erp5/template/openssl.cnf.ca.in
--- a/slapos/recipe/erp5/template/site.zcml
+++ b/slapos/recipe/erp5/template/site.zcml
--- a/slapos/recipe/erp5/template/tidstorage.py.in
+++ b/slapos/recipe/erp5/template/tidstorage.py.in
--- a/slapos/recipe/erp5/template/zeo.conf.in
+++ b/slapos/recipe/erp5/template/zeo.conf.in
--- a/slapos/recipe/erp5/template/zope-deadlockdebugger-snippet.conf.in
+++ b/slapos/recipe/erp5/template/zope-deadlockdebugger-snippet.conf.in
--- a/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in
+++ b/slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in
--- a/slapos/recipe/erp5/template/zope-zeo-snippet.conf.in
+++ b/slapos/recipe/erp5/template/zope-zeo-snippet.conf.in
--- a/slapos/recipe/erp5/template/zope-zodb-snippet.conf.in
+++ b/slapos/recipe/erp5/template/zope-zodb-snippet.conf.in
--- a/slapos/recipe/erp5/template/zope.conf.in
+++ b/slapos/recipe/erp5/template/zope.conf.in
--- a/slapos/recipe/erp5/template/zope.conf.timerservice.in
+++ b/slapos/recipe/erp5/template/zope.conf.timerservice.in
--- a/slapos/recipe/erp5/test_suite_runner.py
+++ b/slapos/recipe/erp5/test_suite_runner.py
--- a/slapos/recipe/erp5/testrunner.py
+++ b/slapos/recipe/erp5/testrunner.py
--- a/slapos/recipe/erp5testnode/SlapOSControler.py
+++ b/slapos/recipe/erp5testnode/SlapOSControler.py
--- a/slapos/recipe/erp5testnode/Updater.py
+++ b/slapos/recipe/erp5testnode/Updater.py
--- a/slapos/recipe/erp5testnode/__init__.py
+++ b/slapos/recipe/erp5testnode/__init__.py
--- a/slapos/recipe/erp5testnode/template/slapos.cfg.in
+++ b/slapos/recipe/erp5testnode/template/slapos.cfg.in
--- a/slapos/recipe/erp5testnode/testnode.py
+++ b/slapos/recipe/erp5testnode/testnode.py
--- a/slapos/recipe/helloworld.py
+++ b/slapos/recipe/helloworld.py
--- a/slapos/recipe/java.py
+++ b/slapos/recipe/java.py
--- a/slapos/recipe/kumofs/__init__.py
+++ b/slapos/recipe/kumofs/__init__.py
--- a/slapos/recipe/kumofs/certificate_authority.py
+++ b/slapos/recipe/kumofs/certificate_authority.py
--- a/slapos/recipe/kumofs/template/kumo_gateway.in
+++ b/slapos/recipe/kumofs/template/kumo_gateway.in
--- a/slapos/recipe/kumofs/template/kumo_manager.in
+++ b/slapos/recipe/kumofs/template/kumo_manager.in
--- a/slapos/recipe/kumofs/template/kumo_server.in
+++ b/slapos/recipe/kumofs/template/kumo_server.in
--- a/slapos/recipe/kumofs/template/openssl.cnf.ca.in
+++ b/slapos/recipe/kumofs/template/openssl.cnf.ca.in
--- a/slapos/recipe/kumofs/template/stunnel.conf.in
+++ b/slapos/recipe/kumofs/template/stunnel.conf.in
--- a/slapos/recipe/kvm/__init__.py
+++ b/slapos/recipe/kvm/__init__.py
--- a/slapos/recipe/kvm/template/kvm_controller_run.in
+++ b/slapos/recipe/kvm/template/kvm_controller_run.in
--- a/slapos/recipe/kvm/template/kvm_run.in
+++ b/slapos/recipe/kvm/template/kvm_run.in
--- a/slapos/recipe/kvm/template/openssl.cnf.ca.in
+++ b/slapos/recipe/kvm/template/openssl.cnf.ca.in
--- a/slapos/recipe/kvm/template/slapmonitor_run.in
+++ b/slapos/recipe/kvm/template/slapmonitor_run.in
--- a/slapos/recipe/kvm/template/slapreport_run.in
+++ b/slapos/recipe/kvm/template/slapreport_run.in
--- a/slapos/recipe/libcloud/__init__.py
+++ b/slapos/recipe/libcloud/__init__.py
--- a/slapos/recipe/libcloud/run.py
+++ b/slapos/recipe/libcloud/run.py
--- a/slapos/recipe/libcloud/template/cloudmgr.cnf.in
+++ b/slapos/recipe/libcloud/template/cloudmgr.cnf.in
--- a/slapos/recipe/libcloudrequest.py
+++ b/slapos/recipe/libcloudrequest.py
--- a/slapos/recipe/librecipe/__init__.py
+++ b/slapos/recipe/librecipe/__init__.py
--- a/slapos/recipe/librecipe/execute.py
+++ b/slapos/recipe/librecipe/execute.py
--- a/slapos/recipe/memcached/__init__.py
+++ b/slapos/recipe/memcached/__init__.py
--- a/slapos/recipe/memcached/certificate_authority.py
+++ b/slapos/recipe/memcached/certificate_authority.py
--- a/slapos/recipe/memcached/template/memcached.in
+++ b/slapos/recipe/memcached/template/memcached.in
--- a/slapos/recipe/memcached/template/openssl.cnf.ca.in
+++ b/slapos/recipe/memcached/template/openssl.cnf.ca.in
--- a/slapos/recipe/memcached/template/stunnel.conf.in
+++ b/slapos/recipe/memcached/template/stunnel.conf.in
--- a/slapos/recipe/mysql/__init__.py
+++ b/slapos/recipe/mysql/__init__.py
--- a/slapos/recipe/mysql/certificate_authority.py
+++ b/slapos/recipe/mysql/certificate_authority.py
--- a/slapos/recipe/mysql/mysql.py
+++ b/slapos/recipe/mysql/mysql.py
--- a/slapos/recipe/mysql/template/initmysql.sql.in
+++ b/slapos/recipe/mysql/template/initmysql.sql.in
--- a/slapos/recipe/mysql/template/logrotate_entry.in
+++ b/slapos/recipe/mysql/template/logrotate_entry.in
--- a/slapos/recipe/mysql/template/my.cnf.in
+++ b/slapos/recipe/mysql/template/my.cnf.in
--- a/slapos/recipe/mysql/template/openssl.cnf.ca.in
+++ b/slapos/recipe/mysql/template/openssl.cnf.ca.in
--- a/slapos/recipe/mysql/template/stunnel.conf.in
+++ b/slapos/recipe/mysql/template/stunnel.conf.in
--- a/slapos/recipe/nbdserver/__init__.py
+++ b/slapos/recipe/nbdserver/__init__.py
--- a/slapos/recipe/nbdserver/template/nbdserver_run.in
+++ b/slapos/recipe/nbdserver/template/nbdserver_run.in
--- a/slapos/recipe/nbdserver/template/onetimeupload_run.in
+++ b/slapos/recipe/nbdserver/template/onetimeupload_run.in
--- a/slapos/recipe/nosqltestbed/__init__.py
+++ b/slapos/recipe/nosqltestbed/__init__.py
--- a/slapos/recipe/nosqltestbed/template/kumo_gateway_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumo_gateway_run.in
--- a/slapos/recipe/nosqltestbed/template/kumo_manager_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumo_manager_run.in
--- a/slapos/recipe/nosqltestbed/template/kumo_server_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumo_server_run.in
--- a/slapos/recipe/nosqltestbed/template/kumotester_manager_run.in
+++ b/slapos/recipe/nosqltestbed/template/kumotester_manager_run.in
--- a/slapos/recipe/nosqltestbed/template/nosqltester_manager_run.in
+++ b/slapos/recipe/nosqltestbed/template/nosqltester_manager_run.in
--- a/slapos/recipe/nosqltestbed/template/nosqltester_run.in
+++ b/slapos/recipe/nosqltestbed/template/nosqltester_run.in
--- a/slapos/recipe/osoeslaptraining/__init__.py
+++ b/slapos/recipe/osoeslaptraining/__init__.py
--- a/slapos/recipe/osoeslaptraining/apache.py
+++ b/slapos/recipe/osoeslaptraining/apache.py
--- a/slapos/recipe/osoeslaptraining/mysql.py
+++ b/slapos/recipe/osoeslaptraining/mysql.py
--- a/slapos/recipe/osoeslaptraining/template/apache.in
+++ b/slapos/recipe/osoeslaptraining/template/apache.in
--- a/slapos/recipe/osoeslaptraining/template/my.cnf.in
+++ b/slapos/recipe/osoeslaptraining/template/my.cnf.in
--- a/slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in
+++ b/slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in
--- a/slapos/recipe/osoeslaptraining/template/php.ini.in
+++ b/slapos/recipe/osoeslaptraining/template/php.ini.in
--- a/slapos/recipe/proactive/__init__.py
+++ b/slapos/recipe/proactive/__init__.py
--- a/slapos/recipe/proactive/template/ProActiveConfiguration.xml.in
+++ b/slapos/recipe/proactive/template/ProActiveConfiguration.xml.in
--- a/slapos/recipe/sheepdogtestbed/__init__.py
+++ b/slapos/recipe/sheepdogtestbed/__init__.py
--- a/slapos/recipe/sheepdogtestbed/template/nosqltester_manager_run.in
+++ b/slapos/recipe/sheepdogtestbed/template/nosqltester_manager_run.in
--- a/slapos/recipe/sheepdogtestbed/template/nosqltester_run.in
+++ b/slapos/recipe/sheepdogtestbed/template/nosqltester_run.in
--- a/slapos/recipe/siptester/__init__.py
+++ b/slapos/recipe/siptester/__init__.py
--- a/slapos/recipe/siptester/template/init_caller.in
+++ b/slapos/recipe/siptester/template/init_caller.in
--- a/slapos/recipe/siptester/template/init_receiver.in
+++ b/slapos/recipe/siptester/template/init_receiver.in
--- a/slapos/recipe/siptester/template/pjsua_caller.conf.in
+++ b/slapos/recipe/siptester/template/pjsua_caller.conf.in
--- a/slapos/recipe/siptester/template/pjsua_receiver.conf.in
+++ b/slapos/recipe/siptester/template/pjsua_receiver.conf.in
--- a/slapos/recipe/slaprunner/__init__.py
+++ b/slapos/recipe/slaprunner/__init__.py
--- a/slapos/recipe/slaprunner/execute.py
+++ b/slapos/recipe/slaprunner/execute.py
--- a/slapos/recipe/slaprunner/template/slapos.cfg.in
+++ b/slapos/recipe/slaprunner/template/slapos.cfg.in
--- a/slapos/recipe/testnode/__init__.py
+++ b/slapos/recipe/testnode/__init__.py
--- a/slapos/recipe/testnode/erp5testreporthandler.py
+++ b/slapos/recipe/testnode/erp5testreporthandler.py
--- a/slapos/recipe/testnode/profile_testnode.py
+++ b/slapos/recipe/testnode/profile_testnode.py
--- a/slapos/recipe/testnode/template/slapos.cfg.in
+++ b/slapos/recipe/testnode/template/slapos.cfg.in
--- a/slapos/recipe/testnode/testnode.py
+++ b/slapos/recipe/testnode/testnode.py
--- a/slapos/recipe/vifib.py
+++ b/slapos/recipe/vifib.py
--- a/slapos/recipe/xwiki/__init__.py
+++ b/slapos/recipe/xwiki/__init__.py
--- a/slapos/recipe/xwiki/template/.svn/all-wcprops
+++ b/slapos/recipe/xwiki/template/.svn/all-wcprops
--- a/slapos/recipe/xwiki/template/.svn/entries
+++ b/slapos/recipe/xwiki/template/.svn/entries
--- a/slapos/recipe/xwiki/template/.svn/text-base/hibernate.cfg.xml.in.svn-base
+++ b/slapos/recipe/xwiki/template/.svn/text-base/hibernate.cfg.xml.in.svn-base
--- a/slapos/recipe/xwiki/template/.svn/text-base/initmysql.sql.in.svn-base
+++ b/slapos/recipe/xwiki/template/.svn/text-base/initmysql.sql.in.svn-base
--- a/slapos/recipe/xwiki/template/.svn/text-base/my.cnf.in.svn-base
+++ b/slapos/recipe/xwiki/template/.svn/text-base/my.cnf.in.svn-base
--- a/slapos/recipe/xwiki/template/.svn/text-base/mysqld.bin.svn-base
+++ b/slapos/recipe/xwiki/template/.svn/text-base/mysqld.bin.svn-base
--- a/slapos/recipe/xwiki/template/.svn/text-base/tomcat-server.xml.in.svn-base
+++ b/slapos/recipe/xwiki/template/.svn/text-base/tomcat-server.xml.in.svn-base
--- a/slapos/recipe/xwiki/template/hibernate.cfg.xml.in
+++ b/slapos/recipe/xwiki/template/hibernate.cfg.xml.in
--- a/slapos/recipe/xwiki/template/initmysql.sql.in
+++ b/slapos/recipe/xwiki/template/initmysql.sql.in
--- a/slapos/recipe/xwiki/template/my.cnf.in
+++ b/slapos/recipe/xwiki/template/my.cnf.in
--- a/slapos/recipe/xwiki/template/mysqld.bin
+++ b/slapos/recipe/xwiki/template/mysqld.bin
--- a/slapos/recipe/xwiki/template/tomcat-server.xml.in
+++ b/slapos/recipe/xwiki/template/tomcat-server.xml.in
--- a/slapos/recipe/zabbixagent/__init__.py
+++ b/slapos/recipe/zabbixagent/__init__.py
--- a/slapos/recipe/zabbixagent/catdatefile.py
+++ b/slapos/recipe/zabbixagent/catdatefile.py
--- a/slapos/recipe/zabbixagent/svcdaemon.py
+++ b/slapos/recipe/zabbixagent/svcdaemon.py
--- a/slapos/recipe/zabbixagent/template/logrotate_entry.in
+++ b/slapos/recipe/zabbixagent/template/logrotate_entry.in
--- a/slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in
+++ b/slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in
--- a/software/cloudooo/development.cfg
+++ b/software/cloudooo/development.cfg
--- a/software/cloudooo/instance.cfg
+++ b/software/cloudooo/instance.cfg
--- a/software/cloudooo/software.cfg
+++ b/software/cloudooo/software.cfg
--- a/software/cloudoootestnode/instance.cfg
+++ b/software/cloudoootestnode/instance.cfg
--- a/software/cloudoootestnode/software.cfg
+++ b/software/cloudoootestnode/software.cfg
--- a/software/erp5/configuration.json
+++ b/software/erp5/configuration.json
--- a/software/erp5/instance.cfg
+++ b/software/erp5/instance.cfg
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
--- a/software/erp5testnode/instance.cfg
+++ b/software/erp5testnode/instance.cfg
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
--- a/software/kumofs/instance.cfg
+++ b/software/kumofs/instance.cfg
--- a/software/kumofs/software.cfg
+++ b/software/kumofs/software.cfg
--- a/software/kvm/instance.cfg
+++ b/software/kvm/instance.cfg
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
--- a/software/mariadb/instance.cfg
+++ b/software/mariadb/instance.cfg
--- a/software/mariadb/software.cfg
+++ b/software/mariadb/software.cfg
--- a/software/memcached/instance.cfg
+++ b/software/memcached/instance.cfg
--- a/software/memcached/software.cfg
+++ b/software/memcached/software.cfg
--- a/software/mysql-5.1/instance.cfg
+++ b/software/mysql-5.1/instance.cfg
--- a/software/mysql-5.1/software.cfg
+++ b/software/mysql-5.1/software.cfg
--- a/software/phpmyadmin/instance.cfg
+++ b/software/phpmyadmin/instance.cfg
--- a/software/phpmyadmin/phpmyadmin.inc.php.in
+++ b/software/phpmyadmin/phpmyadmin.inc.php.in
--- a/software/phpmyadmin/software.cfg
+++ b/software/phpmyadmin/software.cfg
--- a/software/slaprunner/instance.cfg
+++ b/software/slaprunner/instance.cfg
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
--- a/software/vifib/software.cfg
+++ b/software/vifib/software.cfg
--- a/software/wordpress/instance.cfg
+++ b/software/wordpress/instance.cfg
--- a/software/wordpress/software.cfg
+++ b/software/wordpress/software.cfg
--- a/software/wordpress/wp-config.php.in
+++ b/software/wordpress/wp-config.php.in
--- a/software/zabbix-agent/instance.cfg
+++ b/software/zabbix-agent/instance.cfg
--- a/software/zabbix-agent/software.cfg
+++ b/software/zabbix-agent/software.cfg
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
--- a/stack/erp5.cfg
+++ b/stack/erp5.cfg
--- a/stack/flask.cfg
+++ b/stack/flask.cfg
--- a/stack/kvm.cfg
+++ b/stack/kvm.cfg
--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
--- a/stack/shacache-client.cfg
+++ b/stack/shacache-client.cfg