Merge branch 'master' into 1.0

component/6tunnel/buildout.cfg

@@ -11,13 +11,10 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
 md5sum = 74e02d4f0704b3083a01feda66033449
-configure-command =
+pre-configure =
   aclocal
   autoheader
   automake --foreign
   autoconf
-  ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
   PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s

component/apache/buildout.cfg

@@ -33,9 +33,10 @@ recipe = slapos.recipe.cmmi
 version = 2.4.16
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 2b19cd338fd526dd5a63c57b1e9bfee2
-configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
-configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-                    --disable-static
+pre-configure =
+  cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
+  cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
+configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
                     --enable-cache

component/aspell/buildout.cfg

@@ -7,12 +7,9 @@ extends =
   ../ncurses/buildout.cfg
   ../perl/buildout.cfg
 
-[aspell-common-dictionary]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-recipe = plone.recipe.command
-command = mkdir -p ${:location}
-update-command = ${:command}
-stop-on-error = yes
+[aspell-dictionary-common]
+recipe = slapos.recipe.cmmi
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
 
 [aspell]
 recipe = slapos.recipe.cmmi
@@ -24,7 +21,6 @@ environment =
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
 
 [aspell-en-dictionary]
-recipe = slapos.recipe.cmmi
+<= aspell-dictionary-common
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
-configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin

component/babeld/buildout.cfg

@@ -6,7 +6,7 @@ parts = babeld
 
 [babeld]
 recipe = slapos.recipe.cmmi
-url = https://lab.nexedi.cn/rafael/babeld/repository/archive.tar.gz?ref=v1.6.0-nxd1 
+url = https://lab.nexedi.com/rafael/babeld/repository/archive.tar.gz?ref=v1.6.0-nxd1
 md5sum = 1f269d01321103873b8d245df19984f0 
 configure-command =
   echo "No configure.."

component/boinc-client/buildout.cfg

@@ -17,7 +17,7 @@ extends =
   ../../stack/slapos.cfg
 
 [download-boinc]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = http://boinc.berkeley.edu/dl/boinc_7.0.28_x86_64-pc-linux-gnu.sh
 md5sum = efdfd115ae69227ceb6118ca09777988
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -36,7 +36,7 @@ ld_library = ${curl:location}/lib:${openssl:location}/lib:${zlib:location}/lib
 location = ${buildout:parts-directory}/BOINC
 
 [boinc-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/boinc-abs-path.patch
 md5sum = 412acedfbcdc8a9a7f196a02465da248
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

component/cloudooo/buildout.cfg

@@ -11,7 +11,7 @@ setup = ${cloudooo-repository:location}
 
 [cloudooo-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/cloudooo.git
+repository = https://lab.nexedi.com/nexedi/cloudooo.git
 branch = master
 git-executable = ${git:location}/bin/git
 

component/coreutils/buildout.cfg

@@ -10,7 +10,7 @@ recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
 md5sum = abed135279f87ad6762ce57ff6d89c41
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
+  -enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib

component/cpio/buildout.cfg

@@ -3,9 +3,6 @@
 parts = cpio
 
 [cpio]
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/cpio-drop.gets.patch#6c79cb9caf407063543efff93647c450
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
-md5sum = 20fc912915c629e809f80b96b2e75d7d
+url = http://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.bz2
+md5sum = 93eea9f07c0058c097891c73e4955456

component/cpio/cpio-drop.gets.patch

-diff -ur cpio-2.11.orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
---- cpio-2.11.orig/gnu/stdio.in.h	2010-03-10 10:27:03.000000000 +0100
-+++ cpio-2.11/gnu/stdio.in.h	2012-07-23 13:04:56.075242094 +0200
-@@ -139,7 +139,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

component/cyrus-sasl/buildout.cfg

@@ -14,13 +14,11 @@ recipe = slapos.recipe.cmmi
 url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command =
+pre-configure =
   "${libtool:location}/bin/libtoolize" -c -f &&
   "${automake:location}/bin/aclocal" -I "${libtool:location}/share/aclocal" -I config -I cmulocal &&
-  "${automake:location}/bin/automake" -c -a -f &&
-  ./configure
+  "${automake:location}/bin/automake" -c -a -f
 configure-options =
-  --prefix=${:location}
   --disable-digest
   --disable-gssapi
   --disable-otp

component/dropbear/buildout.cfg

@@ -20,7 +20,6 @@ md5sum = 0284ea239083f04c8b874e08e1aca243
 url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-zlib=${zlib:location}
   CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
 

component/firewalld/buildout.cfg

+[buildout]
+
+parts =
+  firewalld-patch
+
+extends =
+  ../pkgconfig/buildout.cfg
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../intltool/buildout.cfg
+  ../gettext/buildout.cfg
+  ../glib/buildout.cfg
+  ../m4/buildout.cfg
+  ../python-slip/buildout.cfg
+  ../dbus/buildout.cfg
+  ../python-2.7/buildout.cfg
+  ../libffi/buildout.cfg
+  ../flex/buildout.cfg
+  ../bison/buildout.cfg
+
+[firewalld]
+recipe = slapos.recipe.cmmi
+url = https://github.com/t-woerner/firewalld/archive/v0.3.14.2.tar.gz
+md5sum = b8f81b536ede502721f69300d374447b
+python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
+pre-configure =
+  sed -i -E 's,(^SUBDIRS *=.*) doc(\b.*),\1\2,' Makefile.am
+  aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
+  ./autogen.sh
+
+environment =
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:%(PATH)s
+  CPPFLAGS=-I${gettext:location}/include
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  PYTHON=${python2.7:location}/bin/python2.7
+  M4=${m4:location}/bin/m4
+  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal
+  FIREWALLD_DEVEL_ENV=${buildout:parts-directory}/${:_buildout_section_name_}/src
+  PYTHONPATH=${buildout:parts-directory}/${:_buildout_section_name_}/src
+
+[dbus-python]
+recipe = slapos.recipe.cmmi
+version = 1.2.0
+url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.tar.gz
+md5sum = b09cd2d1a057cc432ce944de3fc06bf7
+python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
+environment =
+  PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  DBUS_CFLAGS=-I${dbus:location}/include/dbus-1.0 -I${dbus:location}/lib/dbus-1.0/include
+  DBUS_LIBS=-L${dbus:location}/lib -ldbus-1
+  DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
+  DBUS_GLIB_LIBS=-L${dbus-glib:location}/lib -ldbus-glib-1
+  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
+  PYTHON=${python2.7:location}/bin/python2.7
+  PYTHON_INCLUDES=-I${python2.7:location}/include/python2.7
+  PYTHON_LIBS=-L${python2.7:location}/lib -lpython2.7
+
+[gobject-introspection]
+recipe = slapos.recipe.cmmi
+url = https://github.com/GNOME/gobject-introspection/archive/GOBJECT_INTROSPECTION_1_45_2.tar.gz
+pre-configure =
+  libtoolize -c -f
+  aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
+  ./autogen.sh
+configure-options =
+  --disable-static
+
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
+  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
+  M4=${m4:location}/bin/m4
+  ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal
+  PYTHON=${python2.7:location}/bin/python2.7
+  GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
+  GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl -lgobject-2.0
+  FFI_CFLAGS=-I${libffi:location}/include
+  FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
+  GIR_DIR=${buildout:parts-directory}/${:_buildout_section_name_}/share/gir-1.0
+
+[pygobject3]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/pygobject-3.10.2.tar.xz
+python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python2.7/site-packages
+ md5sum = f311155be8510df6ad8e4edf1cb463d4
+pre-configure =
+  sed -i 's#/usr/local#${gobject-introspection:location}#g' ${gobject-introspection:location}/lib/pkgconfig/gobject-introspection-1.0.pc
+configure-options =
+  --disable-static
+  --disable-cairo
+  --with-python=${python2.7:location}/bin/python2.7
+
+environment =
+  PATH=${pkgconfig:location}/bin:${libtool:location}/bin:${glib:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gobject-introspection:location}/lib/pkgconfig
+  PYTHON=${python2.7:location}/bin/python2.7
+  FFI_CFLAGS=-I${libffi:location}/include
+  FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
+  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gettext:location}/include -I${libffi:location}/include
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+#  GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
+#  GLIB_LIBS=-L${glib:location}/lib -lgobject-2.0 -lgthread-2.0 -pthread -lrt -lglib-2.0
+  GIO_LIBS=-L${glib:location}/lib -lgio-2.0
+  GI_CFLAGS=-I${gobject-introspection:location}/include/gobject-introspection-1.0
+  GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
+
+[trusted-config]
+recipe = hexagonit.recipe.download
+url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/trusted.xml
+download-only = true
+filename = trusted.xml
+md5sum = 893752ba2e93a1e96334dfee19f884ad
+
+[firewalld-patch]
+recipe = plone.recipe.command
+python = ${buildout:directory}/bin/${firewalld-eggs:interpreter}
+command =
+  sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/bin/firewall-cmd
+  sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/sbin/firewalld
+  sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:location}/etc/firewalld/firewalld.conf
+  sed -i 's#/usr/lib/firewalld#${firewalld:location}/lib/firewalld#' ${firewalld:location}/lib/python2.7/site-packages/firewall/config/__init__.py
+  sed -i 's#/usr/share/#${firewalld:location}/share#' ${firewalld:location}/lib/python2.7/site-packages/firewall/config/__init__.py
+  sed -i "s#import sys#import sys, os\n\nos.environ['GI_TYPELIB_PATH'] = '${gobject-introspection:location}/lib/girepository-1.0/'#" ${:python}
+  sed -i 's#<syslog/>#<!-- no syslog -->#' ${dbus:location}/etc/dbus-1/system.conf
+  sed -i 's#<user>messagebus</user>#<user>slapsoft</user>#' ${dbus:location}/etc/dbus-1/system.conf
+  cp -f ${firewalld:location}/lib/firewalld/zones/trusted.xml ${firewalld:location}/etc/firewalld/zones/
+  cp -f ${firewalld:location}/etc/dbus-1/system.d/FirewallD.conf ${dbus:location}/etc/dbus-1/system.d/
+  mkdir -p ${buildout:directory}/sbin
+update-command = ${:command}
+
+[firewalld-eggs]
+recipe = zc.recipe.egg:scripts
+interpreter = python.eggs
+eggs =
+  decorator
+  six
+  ${python-slip-egg:eggs}
+
+extra-paths =
+  ${dbus-python:python-egg}
+  ${firewalld:python-egg}
+  ${pygobject3:python-egg}

component/fluentd/buildout.cfg

@@ -11,6 +11,7 @@ url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 ruby-executable = ${ruby:location}/bin/ruby
 gems =
   fluentd==0.12.15
+  fluent-plugin-td==0.10.27
 gem-options = --no-ri --no-rdoc --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/
 environment =
   LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib

component/freetype/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [freetype]
 recipe = slapos.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.5.tar.bz2
-md5sum = 2a7a314927011d5030903179cf183be0
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2
+md5sum = 35cb8f4d9e5906847901bb39324c2f80
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
@@ -24,5 +24,3 @@ environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-make-targets =
-  install && ln -s . ${:location}/include/freetype2/freetype

component/gettext/buildout.cfg

@@ -10,8 +10,8 @@ extends =
 
 [gettext]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.5.1.tar.lz
-md5sum = 153d3c541f4a1a284b365a8cd65875c9
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.6.tar.lz
+md5sum = 45b2a123cdc7cef54df98152a0da3fcc
 
 configure-options =
   --disable-static

component/ghostscript/buildout.cfg

@@ -32,8 +32,8 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.16.tar.bz2
-md5sum = 21732fd6e39acc283bc623b8842cbfbb
+url = http://downloads.ghostscript.com/public/ghostscript-9.18.tar.bz2
+md5sum = aa125af368d89b3dbd15fc379f13375f
 
 [ghostscript-fonts]
 recipe = hexagonit.recipe.download

component/git/buildout.cfg

@@ -16,8 +16,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.5.1.tar.xz
-md5sum = 55b9c496ea2d87148a2bfe1b6f6edd02
+url = https://www.kernel.org/pub/software/scm/git/git-2.5.3.tar.xz
+md5sum = e69b41f2d0a93f3d3dc5eb19196e4e5c
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/groonga/buildout.cfg

@@ -13,8 +13,8 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-5.0.7.tar.gz
-md5sum = 389d5353a18ff5f48ccf65a576c7b2d1
+url = http://packages.groonga.org/source/groonga/groonga-5.0.8.tar.gz
+md5sum = ccb36449fdd62c61367f3ed5e830aec3
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b

component/jasper/buildout.cfg

@@ -16,9 +16,10 @@ patches =
   ${:_profile_base_location_}/CVE-2014-9029.patch#d69195cf17878f024cc0b580045ec314
   ${:_profile_base_location_}/CVE-2014-8137.patch#bc5103b9a33315538106bf6652383a10
   ${:_profile_base_location_}/CVE-2014-8138.patch#bfb9604fe84b6e686fea29bd760cf34d
-# jasper configure script is not executable by default
-configure-command =
-  /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --enable-shared --disable-opengl
+configure-options =
+  --disable-static
+  --enable-shared
+  --disable-opengl
 environment =
   CPPFLAGS=-I${libjpeg:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib

component/leptonica/buildout.cfg

 [buildout]
 parts = leptonica
 extends =
-  ../libtool/buildout.cfg
   ../zlib/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
@@ -13,13 +12,11 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
-configure-command =
-  ./autogen.sh
-  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
+configure-options =
+  --disable-static
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/leptonica-1.69-zlib-include.patch#cff3dc942075190939b407c38e0d3201
 environment =
-  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
   CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib

component/libpng/buildout.cfg

@@ -18,15 +18,15 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.52.tar.xz
-md5sum = 49d5c71929bf69a172147c47b9309fbe
+url = http://download.sourceforge.net/libpng/libpng-1.2.53.tar.xz
+md5sum = 7d18a74e6fd2029aee76ccd00e00a9e6
 
 [libpng15]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.21.tar.xz
-md5sum = 22eaa2e90352fcd153bed0cdecf542cb
+url = http://download.sourceforge.net/libpng/libpng-1.5.23.tar.xz
+md5sum = 725f9b98143450df03decf08b4bc42e3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.16.tar.xz
-md5sum = 23b7286b5d4a86de950fd2ffc5cac742
+url = http://download.sourceforge.net/libpng/libpng-1.6.18.tar.xz
+md5sum = 6a57c8e0f5469b9c9949a4b43d57b3a1

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.5.tar.gz
-md5sum = 81d272697545e82d39f6bd14854b68f0
+url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.7.tar.gz
+md5sum = 12d10ca4ae0a3b95f7aa06a076da39ec
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/manpy/buildout.cfg

@@ -11,7 +11,7 @@ parts =
 
 [dream-repository.git]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/dream.git
+repository = https://lab.nexedi.com/nexedi/dream.git
 branch = master
 git-executable = ${git:location}/bin/git
 develop = true

component/mariadb/buildout.cfg

@@ -20,15 +20,16 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.21
+version = 10.1.8
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 956561f3798d1fe8dfbe4b665287a87a
+md5sum = 9ba0aaabba40153d83e70edcc1aa43a8
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
 patch-options = -p0
 patches =
-  ${:_profile_base_location_}/mariadb_10.0.8_create_system_tables__no_test.patch#a176d491cf45fccd53ee397c70393bc4
+  ${:_profile_base_location_}/mariadb_10.1.8_create_system_tables__no_test.patch#d2f337e76b290071daf8985a79bda82a
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  -DCMAKE_INSTALL_PREFIX=${:location}
   -DBUILD_CONFIG=mysql_release
   -DDEFAULT_CHARSET=utf8
   -DDEFAULT_COLLATION=utf8_unicode_ci
@@ -52,16 +53,20 @@ environment =
   CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${zlib:location}/include
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${zlib:location}/lib
+post-install =
+  mkdir -p ${:location}/include/wsrep &&
+  cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-5.06.tar.gz
-md5sum = 15597acfb1375c931e7b5588511c17bb
-configure-command = mkdir fake_mariadb_source && ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql && ./configure
+url = http://packages.groonga.org/source/mroonga/mroonga-5.08.tar.gz
+md5sum = 65011c1da8700c4950d11dea7355b32d
+pre-configure =
+  mkdir fake_mariadb_source &&
+  ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-mysql-source=fake_mariadb_source
   --with-mysql-config=${mariadb:location}/bin/mysql_config
   --disable-static
@@ -69,6 +74,7 @@ configure-options =
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/mroonga_boolean.patch#36645770ae612515b74b90884ecc59fc
+  ${:_profile_base_location_}/mroonga_5.08_mariadb_10.1.8.patch#ead45e0fbb4cf3c2d39ece012793d3c4
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include

component/mariadb/mariadb_10.0.8_create_system_tables__no_test.patch → component/mariadb/mariadb_10.1.8_create_system_tables__no_test.patch

@@ -5,8 +5,8 @@ circumstances as it is checked first.
 See http://bugs.debian.org/301741
 and http://bugs.mysql.com/bug.php?id=6901
 
---- scripts/mysql_system_tables_data.sql.orig   2013-11-05 17:46:05.000000000 +0100
-+++ scripts/mysql_system_tables_data.sql        2013-11-08 09:28:34.707291508 +0100
+--- scripts/mysql_system_tables_data.sql.orig	2015-10-15 17:43:45.000000000 +0200
++++ scripts/mysql_system_tables_data.sql	2015-10-19 16:44:16.121393390 +0200
 @@ -30,8 +30,6 @@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
@@ -17,9 +17,9 @@ and http://bugs.mysql.com/bug.php?id=6901
  DROP TABLE tmp_db;
  
 @@ -43,8 +41,6 @@
- REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N' FROM dual WHERE @current_hostname != 'localhost';
- REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
- REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N');
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N','',0 FROM dual WHERE @current_hostname != 'localhost';
+ REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N','',0);
+ REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0);
 -INSERT INTO tmp_user (host,user) VALUES ('localhost','');
 -INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost';
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;

component/mariadb/mroonga_5.08_mariadb_10.1.8.patch

+commit 4a40e81d17d1df28cfeca56d3d9c8f26d0132cfa
+Author: Kouhei Sutou <kou@clear-code.com>
+Date:   Sun Oct 18 17:23:28 2015 +0900
+
+    Use public API
+    
+    It fixes a build error on MariaDB 10.1.8.
+
+diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
+index 819de30..bfd9631 100644
+--- a/ha_mroonga.cpp
++++ b/ha_mroonga.cpp
+@@ -9620,13 +9620,13 @@ void ha_mroonga::check_count_skip(key_part_map start_key_part_map,
+ 
+         if (where->type() == Item::FUNC_ITEM) {
+           Item_func *func_item = static_cast<Item_func *>(where);
+-          if (func_item->arg_count == 0) {
++          if (func_item->argument_count() == 0) {
+             break;
+           }
+           target = func_item->key_item();
+           where = where->next;
+           if (func_item->arguments()[0] == where) {
+-            uint n_args = func_item->arg_count;
++            uint n_args = func_item->argument_count();
+             for (; n_args > 0; --n_args) {
+               where = where->next;
+             }

component/mesa/buildout.cfg

@@ -8,31 +8,34 @@ extends =
   ../libtool/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 parts =
   mesa
 
 [mesa]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.freedesktop.org/pub/mesa/10.3.2/MesaLib-10.3.2.tar.bz2
-md5sum = c0a2a975899c4e7485124b388c16cd2f
+url = ftp://ftp.freedesktop.org/pub/mesa/11.0.3/mesa-11.0.3.tar.xz
+md5sum = bf9118bf0fbf360715cfe60baf7a1db5
 configure-options =
   --disable-static
+  --disable-gles1
+  --disable-gles2
   --disable-dri
   --disable-dri3
   --disable-egl
   --disable-gbm
   --disable-xvmc
   --disable-vdpau
+  --disable-va
   --enable-xlib-glx
-  --disable-gallium-gbm
   --disable-shared-glapi
   --disable-driglx-direct
   --disable-gallium-llvm
   --with-gallium-drivers=
   --with-dri-drivers=
 environment =
-  PATH=${autoconf:location}/bin:${bison:location}/bin:${flex:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${bison:location}/bin:${flex:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   PYTHON2=${buildout:executable}
   ACLOCAL=${automake:location}/bin/aclocal -I${libtool:location}/share/aclocal -I${pkgconfig:location}/share/aclocal

component/ncurses/buildout.cfg

@@ -11,7 +11,6 @@ configure-options =
   --with-shared
   --without-ada
   --without-manpages
-  --without-progs
   --without-tests
   --without-normal
   --without-debug

component/openldap/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 
 [openldap]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz
-md5sum = 423c1f23d2a0cb96b3e9baf7e9d7dda7
+url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.42.tgz
+md5sum = 47c8e2f283647a6105b8b0325257e922
 configure-options =
   --disable-static
   --disable-slapd

component/percona-toolkit/buildout.cfg

@@ -10,6 +10,6 @@ parts =
 recipe = slapos.recipe.cmmi
 version = 2.2.15
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/tarball/percona-toolkit-${:version}.tar.gz
-md5sum = 8ccaf3d497c463d593b0101a01f5dccf
+md5sum = 022f40dadaea9025820530ea1f986192
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl/buildout.cfg

@@ -25,4 +25,4 @@ configure-command =
     -Dusethreads
 environment =
   PATH=${patch:location}/bin:%(PATH)s
-post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#539cb3cd0d1090f7f30a8e5a82b37854:post_make_hook
+post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#28d12de5c9c7985e65233d56817e3bec:post_make_hook

component/perl/perl-create-libs-symlink.py

@@ -20,5 +20,8 @@ def post_make_hook(options, buildout):
   # matches[0] is a prefix of "location"
   # For the symlink, we want the relative path.
   rel_link = os.path.relpath(os.path.dirname(matches[0]), location)
-  os.symlink(rel_link, os.path.join(location, "libs-c"))
+  simlink_location = os.path.join(location, "libs-c")
+  if os.path.islink(simlink_location):
+    os.unlink(simlink_location)
+  os.symlink(rel_link, simlink_location)
   print "Created symlink \"libs-c\" to", rel_link

component/pkgconfig/buildout.cfg

@@ -14,17 +14,17 @@ extends =
 
 [pkgconfig]
 recipe = slapos.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-md5sum = aa3c86e67551adc3ac865160e34a2a0d
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.29.tar.gz
+md5sum = 77f27dce7ef88d0634d0d6f90e03a77f
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.
-configure-command =
-  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make && ./configure
+pre-configure =
+  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make
 configure-options =
-  --prefix=${:location}
   --with-installed-glib
   --with-installed-popt
+  --disable-host-tool
 environment =
   PATH=.:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig

component/python-2.7/buildout.cfg

@@ -40,6 +40,7 @@ executable = ${:prefix}/bin/python${:version}
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/fix_compiler_module_issue_20613.patch#94443a77f903e9de880a029967fa6aa7
+  ${:_profile_base_location_}/pytracemalloc_pep445.patch#46662cf0ccc7cb7cfb8289bbfd68b21a
 url =
   http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz
 configure-options =

component/python-PyYAML/buildout.cfg

+[buildout]
+extends =
+  ../libyaml/buildout.cfg
+
+[python-PyYAML]
+recipe = zc.recipe.egg:custom
+egg = PyYAML
+rpath =
+  ${libyaml:location}/lib/
+include-dirs =
+  ${libyaml:location}/include
+library-dirs =
+  ${libyaml:location}/lib

component/python-setuptools/buildout.cfg

@@ -4,10 +4,10 @@ parts = python-setuptools
 [setuptools-download]
 recipe = hexagonit.recipe.download
 download-only = true
-package_suffix = setuptools-1.4.2
+package_suffix = setuptools-18.4
 filename = ${:package_suffix}.tar.gz
 url = https://pypi.python.org/packages/source/s/setuptools/${:filename}
-md5sum = 13951be6711438073fbe50843e7f141f
+md5sum = 214c6c43bd7035e870c1beab402c48e7
 mode = 0644
 
 [python-setuptools]

component/python-slip/buildout.cfg

+[buildout]
+
+parts = 
+  python-slip-egg
+
+[python-slip]
+recipe = slapos.recipe.cmmi
+url = https://fedorahosted.org/released/python-slip/python-slip-0.6.1.tar.bz2
+md5sum = a6d8ee96245fc21785d4c1c062c85f2f
+configure-command = true
+make-targets = 
+make-binary = 
+  make all
+  cp -ax . ${:slip}/
+  cp -ax . ${:slip.dbus}/
+  cp -ax . ${:slip.gtk}/
+  sed -i '/setup(name="slip.dbus"/,/"gtk", "pango"])/d' ${:slip}/setup.py
+  sed -i '/setup(name="slip"/,/selinux"])/d' ${:slip.dbus}/setup.py
+  sed -i '/if sys.version_info.major/,/"gtk", "pango"])/d' ${:slip.dbus}/setup.py
+  sed -i '/setup(name="slip"/,/xml.etree.ElementTree"])/d' ${:slip.gtk}/setup.py
+slip = ${buildout:parts-directory}/slip
+slip.dbus = ${buildout:parts-directory}/slip.dbus
+slip.gtk = ${buildout:parts-directory}/slip.gtk
+
+[slip.gtk-develop]
+recipe = zc.recipe.egg:develop
+setup = ${python-slip:slip.gtk}
+egg-name = slip.gtk
+
+[slip.dbus-develop]
+recipe = zc.recipe.egg:develop
+setup = ${python-slip:slip.dbus}
+egg-name = slip.dbus
+
+[slip-develop]
+recipe = zc.recipe.egg:develop
+setup = ${python-slip:slip}
+egg-name = slip
+
+[python-slip-egg]
+recipe = zc.recipe.egg
+eggs =
+  ${slip-develop:egg-name}
+  ${slip.dbus-develop:egg-name}
+  ${slip.gtk-develop:egg-name}
+  

component/qemu-kvm/buildout.cfg

@@ -15,8 +15,8 @@ extends =
 [kvm]
 recipe = slapos.recipe.cmmi
 # qemu-kvm and qemu are now the same since 1.3.
-url = http://wiki.qemu-project.org/download/qemu-2.2.1.tar.bz2
-md5sum = 833ff4457062456d38d6567f802ffef4
+url = http://wiki.qemu-project.org/download/qemu-2.4.0.tar.bz2
+md5sum = 186ee8194140a484a455f8e3c74589f4
 configure-options =
   --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
   --enable-system
@@ -29,9 +29,9 @@ configure-options =
   --disable-curl
   --enable-kvm
   --disable-docs
+  --enable-vnc
   --enable-vnc-png
   --disable-vnc-jpeg
-  --enable-vnc-ws
   --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
   --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
   --disable-werror
@@ -43,9 +43,9 @@ environment =
 [debian-amd64-netinst.iso]
 # Download the installer of Debian 8 (Jessie)
 recipe = hexagonit.recipe.download
-url = http://cdimage.debian.org/debian-cd/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-netinst.iso
+url = http://cdimage.debian.org/debian-cd/8.2.0/amd64/iso-cd/debian-8.2.0-amd64-netinst.iso
 filename = ${:_buildout_section_name_}
-md5sum = 1a311f9afb68d6365211b13b4342c40b
+md5sum = 762eb3dfc22f85faf659001ebf270b4f
 download-only = true
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}

component/slapos/buildout.cfg

@@ -9,12 +9,14 @@ extends =
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../patch/buildout.cfg
+  ../firewalld/buildout.cfg
 
 parts =
   slapos
   cfg-environment
   sh-environment
   py
+  firewalld-patch
 
 
 
@@ -76,14 +78,16 @@ rpath =
 #############################################
 
 [slapos]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs =
+  ${lxml-python:egg}
   ${python-cffi:egg}
+  ${python-PyYAML:egg}
+  ${python-cliff:egg}
   ${python-cryptography:egg}
   pyOpenSSL
   slapos.libnetworkcache
   zc.buildout
-  ${lxml-python:egg}
   slapos.core
 
 initialization =

component/tesseract/buildout.cfg

@@ -20,13 +20,15 @@ patch-options =
 patches =
   ${:_profile_base_location_}/tesseract-3.00-gcc-4.7-build.patch#ca80db3ec489c547b03f3ee48879c1b1
   ${:_profile_base_location_}/tesseract-3.01-remove-bom.patch#2e691858cb492b7c17d23bf0912b3d24
-configure-command =
+pre-configure =
   libtoolize -f -c
   aclocal -I ${libtool:location}/share/aclocal -I config
   autoheader -f
   automake -c -a -f
   autoconf -Wno-portability
-  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --datarootdir=${tesseract-eng-traineddata:location}
+configure-options =
+  --disable-static
+  --datarootdir=${tesseract-eng-traineddata:location}
 # XXX: tesseract seems not easily configurable at runtime about where to find
 # its trained data, so we set its datarootdir above to a controlled location
 

component/trafficserver/buildout.cfg

 [buildout]
 extends =
   ../../component/lua/buildout.cfg
-  ../../component/hwloc/buildout.cfg
   ../../component/pkgconfig/buildout.cfg
   ../../component/libtool/buildout.cfg
   ../../component/make/buildout.cfg
@@ -23,7 +22,6 @@ recipe = slapos.recipe.cmmi
 url = http://apache.claz.org/trafficserver/trafficserver-4.2.3.tar.bz2
 md5sum = 1d06a6e9063ceea3f19dbb84752ec710
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-openssl=${openssl:location}
   --with-xml=libxml2
   --with-libxml2=${libxml2:location}

component/userhosts/buildout.cfg

@@ -12,7 +12,7 @@ location = ${userhosts-get:location}/userhosts
 
 [userhosts-get]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/userhosts.git
+repository = https://lab.nexedi.com/nexedi/userhosts.git
 revision = d3080ad4b82c91dc14fd2ad2a8e9b2512e600c2a
 git-executable = ${git:location}/bin/git
 location = ${buildout:parts-directory}/userhosts

component/wendelin.core/buildout.cfg

@@ -24,7 +24,7 @@ PATH = ${git:location}/bin:%(PATH)s
 
 [wendelin.core-repository]
 recipe  = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.cn/nexedi/wendelin.core.git
+repository = https://lab.nexedi.com/nexedi/wendelin.core.git
 # dir is pretty name as top-level -dev recipe
 location = ${buildout:parts-directory}/wendelin.core-dev
 git-executable = ${git:location}/bin/git

component/xorg/buildout.cfg

@@ -274,8 +274,8 @@ environment =
 
 [pixman]
 recipe = slapos.recipe.cmmi
-url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.33.2.tar.bz2
-md5sum = 837f48ecedb96f2d558f0d5763e9447b
+url = http://xorg.freedesktop.org/archive/individual/lib/pixman-0.32.8.tar.bz2
+md5sum = 18d6b62abdb7bc0f8e6b0ddf48986b2c
 configure-options =
   --disable-static
 

slapos/recipe/kvm/template/kvm_run.in

@@ -49,6 +49,11 @@ httpd_port = %(httpd-port)s
 netcat_bin = '%(netcat-binary)s'.strip()
 cluster_doc_host = '%(cluster-doc-host)s'
 cluster_doc_port = %(cluster-doc-port)s
+language = '%(language)s'
+language_list = ['ar', 'da', 'de', 'de-ch', 'en-gb', 'en-us', 'es', 'et', 'fi',
+    'fo', 'fr', 'fr-be', 'fr-ca', 'fr-ch', 'hr', 'hu', 'is', 'it', 'ja', 'lt',
+    'lv', 'mk', 'nl', 'nl-be', 'no', 'pl', 'pt', 'pt-br', 'ru', 'sl', 'sv',
+    'th', 'tr']
 
 def md5Checksum(file_path):
     with open(file_path, 'rb') as fh:
@@ -246,6 +251,8 @@ if tap_network_parameter == [] and nat_network_parameter == []:
   print 'Warning : No network interface defined.'
 else:
   kvm_argument_list += nat_network_parameter + tap_network_parameter
+if language in language_list:
+  kvm_argument_list.extend(['-k', language])
 
 for disk in additional_disk_list:
   kvm_argument_list.extend([

slapos/recipe/mkdirectory.py

@@ -33,7 +33,7 @@ class Recipe(GenericBaseRecipe):
   def _options(self, options):
     self.directory = options.copy()
     del self.directory['recipe']
-    self.mode = int(self.directory.pop('mode', '700'), 8)
+    self.mode = int(self.directory.pop('mode', '0777'), 8)
 
   def install(self):
     for path in sorted(self.directory.itervalues()):

slapos/recipe/neoppod.py

@@ -24,6 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+import os
 from slapos.recipe.librecipe import GenericBaseRecipe
 from zc.buildout import UserError
 
@@ -50,6 +51,13 @@ class NeoBaseRecipe(GenericBaseRecipe):
       #'-n', options['name'],
       '-c', options['cluster'],
     ]
+    if options['ssl']:
+      etc = os.path.join(self.buildout['buildout']['directory'], 'etc', '')
+      option_list += (
+        '--ca', etc + 'ca.crt',
+        '--cert', etc + 'neo.crt',
+        '--key', etc + 'neo.key',
+        )
     option_list.extend(self._getOptionList())
     return [self.createPythonScript(
       options['wrapper'],

slapos/recipe/simplehttpserver/simplehttpserver.py

@@ -65,7 +65,7 @@ class ServerHandler(SimpleHTTPRequestHandler):
     logging.info('Writing recieved content to file %s' % file_path)
     try:
       with open(file_path, method) as myfile:
-        myfile.write(content.decode('utf-8'))
+        myfile.write(content)
         logging.info('Done.')
     except IOError as e:
       logging.error('Something happened while processing \'writeFile\'. The message is %s' %

software/agent/software.cfg

@@ -26,7 +26,7 @@ git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = agent3
 git-executable = ${git:location}/bin/git
 
@@ -54,7 +54,7 @@ md5sum = 7c5c43eb98d5a11961d72fce97a8e67b
 mode = 0644
 
 [script]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs =
   zc.buildout
   slapos.core

software/ajaxplorer/software.cfg

@@ -73,7 +73,7 @@ md5sum = c5695762361b801c284ee23a150cd1f1
 mode = 0644
 
 [template-httpd-conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = apache.conf.in
@@ -86,6 +86,5 @@ numpy = 1.6.2
 # websockify 0.4.1 doesn't install well
 websockify = 0.3.0
 plone.recipe.command = 1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 z3c.recipe.mkdir = 0.5

software/apache-frontend/software.cfg

@@ -5,35 +5,35 @@ extends = common.cfg
 PyRSS2Gen = 1.1
 apache-libcloud = 0.18.0
 cns.recipe.symlink = 0.2.3
-collective.recipe.template = 1.11
 ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
+rdiff-backup = 1.0.5
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.51
+slapos.toolbox = 0.52
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox==0.51
+# slapos.toolbox==0.52
 GitPython = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.51
+# slapos.toolbox==0.52
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.51
+# slapos.toolbox==0.52
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox==0.51
+# slapos.toolbox==0.52
 lockfile = 0.10.2
 
 # Required by:
-# slapos.toolbox==0.51
-paramiko = 1.15.2
+# slapos.toolbox==0.52
+paramiko = 1.15.3
 
 # Required by:
-# slapos.toolbox==0.51
+# slapos.toolbox==0.52
 rpdb = 0.1.5

software/boinc-client/software.cfg

@@ -28,5 +28,4 @@ mode = 0644
 
 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2

software/boinc/software.cfg

@@ -32,7 +32,7 @@ app-name = upper_case
 version = 1.00
 
 [template-base]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 download-only = true
 mode = 0644
 

software/bonjourgrid/software.cfg

@@ -78,7 +78,7 @@ app-name = upper_case
 version = 1.00
 
 [template-base]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 download-only = true
 mode = 0644
 
@@ -124,7 +124,7 @@ md5sum = 42985a425369e4f93211cfaad21d8eb8
 mode = 0644
 
 [description-file]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 mode = 0644
 url = ${:_profile_base_location_}/condor_job/submit
 filename = submit
@@ -132,7 +132,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 md5sum = 8180d88348b89b55216f8dd4475a9eea
 
 [executable]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 mode = 0774
 url = ${:_profile_base_location_}/condor_job/simple
 filename = simple

software/cdn-me/software.cfg

@@ -28,7 +28,7 @@ mode = 0644
 branch = request.product
 
 [eggs]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs =
   collective.recipe.environment
   cns.recipe.symlink

software/davstorage/development.cfg

@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
 

software/davstorage/software.cfg

@@ -20,7 +20,7 @@ git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
 

software/dream/software.cfg

@@ -25,7 +25,7 @@ initialization =
   ${manpy:initialization}
 
 [dream_interpreter]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs = ${manpy:eggs}
 interpreter = dream_interpreter
 initialization =
@@ -51,12 +51,10 @@ tablib = 0.10.0
 MySQL-python = 1.2.5
 
 # indirect dependancies
-collective.recipe.template = 1.11
 cp.recipe.cmd = 0.5
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.7
+slapos.recipe.template = 2.8
 zope.exceptions = 4.0.7
 zope.testing = 4.1.3
 zc.recipe.testrunner = 2.0.0
 zope.testrunner = 4.4.6
-z3c.recipe.scripts = 1.0.1

software/erp5/instance-erp5-input-schema.json

@@ -220,6 +220,13 @@
           },
           "storage-dict": {
             "description": "Storage configuration. For NEO, 'logfile' is automatically set (see http://git.erp5.org/gitweb/neoppod.git/blob/HEAD:/neo/client/component.xml for other settings).",
+            "properties": {
+              "ssl": {
+                "description": "For external NEO. Pass false if you want to disable SSL or pass custom values for ca/cert/key.",
+                "default": true,
+                "type": "boolean"
+              }
+            },
             "additionalProperties": {"type": "string"},
             "type": "object"
           }

software/etherpad-lite/common.cfg

@@ -63,7 +63,7 @@ output = ${buildout:directory}/template-etherpad-lite.cfg
 mode = 0644
 
 [template-conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = settings.json.in
@@ -71,7 +71,7 @@ md5sum = 19ab39e6b3256c82fd54ce074488b136
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-run-script]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/${:filename}
 mode = 0644
 filename = run.sh.in

software/etherpad-lite/development.cfg

@@ -19,7 +19,7 @@ git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
 

software/etherpad-lite/software.cfg

@@ -19,7 +19,7 @@ git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
 

software/html5as/software.cfg

@@ -35,7 +35,7 @@ md5sum = 41cb6178f760238ca276854873ef9364
 mode = 0644
 
 [template_nginx_conf]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/nginx_conf.in
 md5sum = 61dc4c82bf48563228ce4dea6c5c6319
 filename = nginx_conf.in
@@ -43,7 +43,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template_launcher]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/launcher.in
 md5sum = acf5bb55ceac2e826259d28ed5c1de3a
 filename = launcher.in
@@ -51,7 +51,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template_downloader]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/downloader.in
 md5sum = 9779e2db6c73d282f802b3407b390ede
 filename = downloader.in
@@ -59,7 +59,7 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template_mime_types]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/mime_types.in
 md5sum = 4ef94a7b458d885cd79ba0b930a5727e
 filename = mime_types.in
@@ -75,7 +75,6 @@ rdiff-backup = 1.0.5
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4
 smmap = 0.8.2
-z3c.recipe.scripts = 1.0.1
 plone.recipe.command = 1.1
 
 # Required by:
@@ -92,4 +91,4 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.40.2
-paramiko = 1.15.2
+paramiko = 1.15.3

software/html5ide/software.cfg

@@ -46,6 +46,5 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 [versions]
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
-collective.recipe.template = 1.11
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.7
+slapos.recipe.template = 2.8

software/kvm/common.cfg

@@ -43,7 +43,7 @@ parts =
 #XXX-Cedric : add list of keyboard layouts (azerty/us querty/...) parameter to qemu
 
 [eggs]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   websockify
@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 52e115fe1aaf232994af9037bf7c292c
+md5sum = 90309e9a1efe6d6b981a27f503c86277
 download-only = true
 on-update = true
 
@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 5700de1cadde0b5bede78f08e215f47a
+md5sum = 0e06ef2879454eee140fe00e167a01d5
 download-only = true
 on-update = true
 
@@ -114,7 +114,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-resilient.cfg.jinja2
 mode = 644
-md5sum = 7071b61a862ee681c2e4323e6435e98d
+md5sum = 450a50069f5617993ac8de47d533d653
 download-only = true
 on-update = true
 

software/kvm/development.cfg

@@ -24,13 +24,13 @@ git-executable = ${git:location}/bin/git
 
 [slapos.core-repository]
 recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.cn/nexedi/slapos.core.git
+repository = https://lab.nexedi.com/nexedi/slapos.core.git
 branch = master
 git-executable = ${git:location}/bin/git
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = master
 git-executable = ${git:location}/bin/git
 
@@ -54,4 +54,6 @@ command =
 slapos.cookbook =
 slapos.core =
 slapos.toolbox =
-erp5.util =
+erp5.util =
\ No newline at end of file
+# XXX Fix lockfile 0.11.0 requirement (pbr!=0.7,<1.0,>=0.6)
+lockfile = 0.10.2
\ No newline at end of file

software/kvm/instance-kvm-cluster-input-schema.json

@@ -122,6 +122,25 @@
       },
       "type": "object"
     },
+    "fw-restricted-access": {
+      "title": "Restrict all access to VM with firewall.",
+      "description": "When Firewall is enabled, this parameter define if only vm of this cluster and authorized sources ip should have access to cluster.",
+      "type": "string",
+      "enum": ["on", "off"],
+      "default": "off"
+    },
+    "fw-authorized-sources": {
+        "title": "List of IP/Network address authorized to cluster.",
+        "description": "When Firewall is enabled, this contain the list of IP address to authorize for access to all VM of this cluster.",
+        "type": "array",
+        "optional": true
+    },
+    "fw-reject-sources": {
+        "title": "List of IP/Network address rejected, if 'Restrict all access' is off.",
+        "description": "When Firewall is enabled, this contain the list of IP address which should not access to all VM of this cluster.",
+        "type": "array",
+        "optional": true
+    },
     "authorized-keys": {
       "title": "Public keys for virtual machines.",
       "description": "Set the list of public keys to add in your virtual machine. The public key file will be available in the VM via url http://10.0.2.100/authorized_keys if you keep the NAT interface enabled",
@@ -198,6 +217,12 @@
               "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",
               "type": "string"
             },
+            "keyboard-layout-language": {
+              "title": "Use keyboard layout language",
+              "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",
+              "type": "string",
+              "enum": ["ar", "da", "de", "de-ch", "en-gb", "en-us", "es", "et", "fi", "fo", "fr", "fr-be", "fr-ca", "fr-ch", "hr", "hu", "is", "it", "ja", "lt", "lv", "mk", "nl", "nl-be", "no", "pl", "pt", "pt-br", "ru", "sl", "sv", "th", "tr"]
+            },
             "nbd-host": {
               "title": "NBD hostname or IP",
               "description": "hostname (or IP) of the NBD server containing the boot image.",

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -74,6 +74,13 @@ config-enable-monitor = True
 config-document-host = ${apache-conf:ip}
 config-document-port = ${apache-conf:port}
 config-document-path = ${hash-code:passwd}
+config-keyboard-layout-language = {{ dumps(kvm_parameter_dict.get('keyboard-layout-language', '')) }}
+
+{% set authorized_source_list = slapparameter_dict.get('fw-authorized-sources', []) -%}
+{% set rejected_source_list = slapparameter_dict.get('fw-reject-sources', []) -%}
+sla-fw_authorized_sources = {{ authorized_source_list | join(' ') }}
+sla-fw_rejected_sources = {{ rejected_source_list | join(' ') }}
+sla-fw_restricted_access = {{ dumps(slapparameter_dict.get('fw-restricted-access', 'off')) }}
 
 return = 
   backend-url

software/kvm/instance-kvm-input-schema.json

@@ -44,6 +44,12 @@
       "description": "Simulate a multi node NUMA system. If mem and cpus are omitted, resources are split equally. Each numa option are separated by space: node,nodeid=4,cpus=40-49,mem=64g node,nodeid=1,cpus=10-19,mem=128g. Set this option if you know what you're doing.",
       "type": "string"
     },
+    "keyboard-layout-language": {
+      "title": "Use keyboard layout language",
+      "description": "Use keyboard layout language (for example fr for French). Can be usefull with VNC display",
+      "type": "string",
+      "enum": ["ar", "da", "de", "de-ch", "en-gb", "en-us", "es", "et", "fi", "fo", "fr", "fr-be", "fr-ca", "fr-ch", "hr", "hu", "is", "it", "ja", "lt", "lv", "mk", "nl", "nl-be", "no", "pl", "pt", "pt-br", "ru", "sl", "sv", "th", "tr"]
+    },
 
     "nbd-host": {
       "title": "NBD hostname",

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -34,7 +34,7 @@ return =
 # XXX: return ALL parameters (like nat rules), through jinja
   backend-url url ip
 
-[publish-connection-informations]
+[publish-connection-information]
 recipe = slapos.cookbook:publish
 backend-url = ${request-kvm:connection-backend-url}
 url = ${request-kvm:connection-url}

software/kvm/instance-kvm.cfg.jinja2

@@ -186,6 +186,7 @@ cluster-doc-host =
 cluster-doc-port = 0
 {% endif -%}
 netcat-binary = {{ netcat_bin }}
+language = ${slap-parameter:keyboard-layout-language}
 
 [kvm-vnc-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -567,3 +568,6 @@ authorized-key =
 
 # send some content which will be accessible to the vm through static url: http://10.0.2.100/data
 data-to-vm =
+
+# Change keyboard layout language
+keyboard-layout-language = 

software/kvm/monitor/ansibleReport.py

+#!/usr/bin/env python
+
+# Parse Ansible result log file and and generate a report
+
+import os, time
+import json
+import sqlite3
+from datetime import datetime, timedelta
+
+import sys
+
+FIELDS = ['cmd', 'command', 'start', 'end', 'delta', 'msg', 'stdout', 'stderr',
+          'response', 'status_code', 'url', 'dest']
+
+class ansibleReport(object):
+
+  def __init__(self, db_path,
+                    ansible_log_dir,
+                    name):
+    self.db_path = db_path
+    self.ansible_log_dir = ansible_log_dir
+    self.name = name
+    self.result_OK = '127.0.0.1_OK'
+    self.result_failed = '127.0.0.1_FAILED'
+    self.result_failed_ignore = '127.0.0.1_FAILED_INGORED' # tipo in ansible log upload pluging
+    self.date_format = '%Y-%m-%d %H:%M:%S'
+    self.day_format = '%Y-%m-%d'
+    
+    self._init_db()
+
+  def _init_db(self):
+    db = sqlite3.connect(self.db_path)
+    c = db.cursor()
+    c.executescript("""
+CREATE TABLE IF NOT EXISTS ansible_report (
+  name VARCHAR(40),
+  reportdate VARCHAR(15),
+  createdate VARCHAR(15),
+  status VARCHAR(20),
+  success_count INTEGER,
+  ignored_count INTEGER,
+  failed_count INTEGER,
+  ignored TEXT,
+  failed TEXT,
+  success TEXT);
+""")
+    db.commit()
+    db.close()
+
+  def connect_db(self):
+    db = sqlite3.connect(self.db_path)
+    return db
+
+  def insertEntryDb(self, table_name, data_dict):
+    db = self.connect_db()
+    columns = data_dict.keys()
+    entries = ', '.join(columns)
+    values = '?' + ', ?' * (len(columns)-1)
+    sql_string = "insert into %s(%s) values (%s)" % (
+                    table_name, entries, values)
+    tuple_data = ()
+    for key in columns:
+      tuple_data += (data_dict[key],)
+    db.execute(sql_string, tuple_data)
+    db.commit()
+    db.close()
+
+  def selectEntriesDb(self, fields=[], start_date=None, limit=0, success=None, order='DESC', where=""):
+    db = self.connect_db()
+
+    entries = ', '.join(fields) if fields else '*'
+    query = "select %s from ansible_report " % entries
+    where = " and %s" % where if where else ""
+    if not start_date:
+      start_date = datetime.utcnow().strftime(self.day_format)
+    tuple_values = (start_date,)
+    if success is not None:
+      status = 'OK' if success else 'FAILLED'
+      query += "where createdate>=? and status=? %s order by createdate %s" % (where, order)
+      tuple_values += (status,)
+    else:
+      query += "where createdate>=? %s order by createdate %s" % (where, order)
+    if limit:
+      query += " limit ?"
+      tuple_values += (limit,)
+
+    rows = db.cursor().execute(query, tuple_values)
+    #db.close()
+    if rows:
+      return [list(row) for row in rows]
+    return []
+
+  def truncateEntriesDb(self, table_name, on_field, to_value, operator='<'):
+    db = self.connect_db()
+    query = "delete from %s where %s%s?" % (table_name, on_field,
+                                            operator)
+    db.execute(query, (to_value,))
+    db.commit()
+    db.close()
+
+  def getLogString(self, res, head=False):
+    log = ""
+    if type(res) == type(dict()):
+      log = '%s, args [%s]\n' % (res['invocation']['module_name'],
+                                        res['invocation']['module_args'])
+      if head:
+        return log
+      for field in FIELDS:
+        if field in res.keys():
+        	# use default encoding, check out sys.setdefaultencoding
+          log += '\n{0}:\n{1}'.format(field, res[field])
+  
+    return log
+
+  def _read_file(self, filepath):
+    content = '[]'
+    with open(filepath, 'r') as f:
+      content = f.read()
+    return content
+
+  def saveResult(self):
+    
+    date = datetime.utcnow().strftime(self.date_format)
+
+    files_list = os.listdir(self.ansible_log_dir)
+    if not len(files_list):
+      return
+
+    to_date = (datetime.now() - timedelta(days=2)).strftime(self.date_format)
+    cmp_file = os.path.join(self.ansible_log_dir, files_list.pop())
+    modification_date = datetime.fromtimestamp(
+                            os.path.getmtime(cmp_file)
+                          ).strftime(self.date_format)
+    # Get the latest insert date
+    result = self.selectEntriesDb(['reportdate'], start_date=to_date, limit=1)
+    if len(result):
+      latest_date = result[0][0]
+      if latest_date >= modification_date:
+        return
+
+    file_map = dict(
+          success_file=os.path.join(self.ansible_log_dir, self.result_OK),
+          failed_file=os.path.join(self.ansible_log_dir, self.result_failed),
+          ignored_file=os.path.join(self.ansible_log_dir, self.result_failed_ignore))
+    
+    data = dict(name=self.name, status='FAILED',
+                reportdate=modification_date, createdate=date,
+                success_count=0, ignored_count=0,
+                failed_count=0, success="",
+                failed="", ignored="")
+    for category in ('failed', 'success', 'ignored'):
+      file_category = file_map['%s_file' % category]
+      if os.path.exists(file_category):
+        text_content = self._read_file(file_category)
+        count = len(json.loads(text_content))
+        if count > 0:
+          data['%s_count' % category] = count
+          data[category] = text_content
+    
+    if data['failed_count'] == 0:
+      data['status'] = 'OK'
+
+    self.insertEntryDb('ansible_report', data)
+
+  def getAnsibleReport(self, start_date=None, limit=0, success=None, order='DESC', category=None, head=False, only_state=True):
+    """Get one or many entries from the ansible report table.
+    """
+    where = ""
+    get_content = category is not None
+    fields = ['name', 'reportdate', 'createdate', 'status', 'success_count',
+                'ignored_count', 'failed_count']
+    if category:
+      where = " %s_count>0" % category
+      if not only_state:
+        fields.append(category)
+
+    rows = self.selectEntriesDb(fields=fields, start_date=start_date,
+                                limit=limit, success=success, order=order,
+                                where=where)
+    result_dict = {}
+    if category and not only_state:
+      last_pos = len(fields) -1
+      for i in range (0, len(rows)):
+        message = ""
+        message_list = json.loads(rows[i][last_pos])
+        for msg in message_list:
+          message += '%s\n\n' %  self.getLogString(msg, head=head)
+        rows[i][last_pos] = message
+    else:
+      return {}
+    return rows
+
+
+if __name__ == "__main__":
+  json = """{
+  "status": "OK",
+  "message": "kvm-1: OK(114) FAILED(0) IGNORED(2)",
+  "description": "Ansible playbook report in kvm-1. Execution date is: 2015-08-28 17:42:01."
+}"""
+  parameter_dict = json.loads(sys.argv[1])
+  with open(parameter_dict['status_path'], 'w') as status_file:
+    status_file.write(json)
+  
+  
\ No newline at end of file

software/kvm/software.cfg

@@ -13,7 +13,6 @@ ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.7
 smmap = 0.9.0
 erp5.util = 0.4.43
@@ -45,7 +44,7 @@ numpy = 1.9.2
 
 # Required by:
 # slapos.toolbox==0.48
-paramiko = 1.15.2
+paramiko = 1.15.3
 
 # Required by:
 # slapos.toolbox==0.48

software/lamp-template/software.cfg

@@ -12,7 +12,7 @@ md5sum = Student may put here md5sum of this file, this is good idea
 strip-top-level-dir = true
 
 [application-template]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/REPLACE_ME_BY_APPLICATION_TEMPLATE_NAME
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in

software/monitor/cgi-httpd.conf.in

@@ -34,7 +34,7 @@ Header always set Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=A
 Header set Access-Control-Allow-Credentials "true"
 Header set Access-Control-Allow-Methods "PROPFIND, PROPPATCH, COPY, MOVE, DELETE, MKCOL, LOCK, UNLOCK, PUT, GETLIB, VERSION-CONTROL, CHECKIN, CHECKOUT, UNCHECKOUT, REPORT, UPDATE, CANCELUPLOAD, HEAD, OPTIONS, GET, POST"
 Header set Access-Control-Allow-Headers "Overwrite, Destination, Content-Type, Depth, User-Agent, X-File-Size, X-Requested-With, If-Modified-Since, X-File-Name, Cache-Control, Authorization"
-
+Header set Access-Control-Expose-Headers "Content-Disposition, Content-Type, Content-Length, WWW-Authenticate, WWW-Logout, Location, Date, Last-Modified, ETag, Accept-Ranges, Content-Range"
 
 
 # SSL Configuration

software/monitor/fluentd-agent.conf.jinja2.in

+# DESTINATION
+<match td.*.*>
+  type tdlog
+  apikey YOUR_API_KEY
+
+  auto_create_table
+  buffer_type file
+  buffer_path {{ fluentd_log_directory }}/td-agent/buffer/td
+
+  <secondary>
+    type file
+    path {{ fluentd_log_directory }}/failed_records
+  </secondary>
+</match>
+
+## match tag=debug.** and dump to console
+<match debug.**>
+  type stdout
+</match>
+
+<source>
+  type tail
+  path {{ crawl_log_directory }}/*/*ping.log.20*
+  pos_file {{ crawl_log_directory }}/tail_in_ping.pos
+  tag slapos.monitor.networktest.ping.ipv4
+  format /^(?<time>[^;]*);(?<logtype>[^;]*);(?<computer_name>[^;]*);(?<type>[^;]*);(?<name_or_ip>[^;]*);(?<code>[^;]*);(?<average>[^;]*);(?<packet_lost>[^;]*);(?<extra>[^;]*)$/
+  read_from_head true
+</source>
+
+<source>
+  type tail
+  path {{ crawl_log_directory }}/*/*ping6.log.20*
+  pos_file {{ crawl_log_directory }}/tail_in_ping6.pos
+  tag slapos.monitor.networktest.ping.ipv6
+  format /^(?<time>[^;]*);(?<logtype>[^;]*);(?<computer_name>[^;]*);(?<type>[^;]*);(?<name_or_ip>[^;]*);(?<code>[^;]*);(?<average>[^;]*);(?<packet_lost>[^;]*);(?<extra>[^;]*)$/
+  read_from_head true
+</source>
+
+<match slapos.monitor.networktest.ping.*>
+  type copy
+{% for slave_instance in slave_instance_list -%}
+{% if  slave_instance.get("ping_ip_list") -%} 
+  <store>
+    type grep
+    regexp1 name_or_ip ^{{ slave_instance.get("ping_ip_list") }}$
+    add_tag_prefix {{ slave_instance.get("slave_reference") }}
+  </store>
+{% endif -%}
+{% if  slave_instance.get("ping6_ip_list") -%}
+  <store>
+    type grep
+    regexp1 name_or_ip ^{{ slave_instance.get("ping6_ip_list") }}$
+    add_tag_prefix {{ slave_instance.get("slave_reference") }}
+  </store>
+{% endif -%}
+{% endfor -%}
+</match>
+
+{% for slave_instance in slave_instance_list -%}
+<match {{ slave_instance.get("slave_reference") }}.slapos.monitor.networktest.ping.ipv6>
+  type file
+  path {{ network_user_logs }}/{{ slave_instance.get("slave_reference") }}/ping6/log
+  append true
+  include_time_key true
+  include_tag_key true
+  format json
+</match>
+<match {{ slave_instance.get("slave_reference") }}.slapos.monitor.networktest.ping.ipv4>
+  type file
+  path {{ network_user_logs }}/{{ slave_instance.get("slave_reference") }}/ping/log
+  append true
+  include_time_key true
+  include_tag_key true
+  format json
+</match>
+{% endfor -%}
+
+<source>
+  type tail
+  path {{ network_user_logs }}/*/ping*/log/*.log
+  pos_file {{ crawl_log_directory }}/tail_in_ping6.pos
+  tag slapos.wendelin.networktest
+  format json 
+  read_from_head true
+</source>
+
+{% set wendelin_streamtool_uri = slapparameter_dict.get('wendelin-streamtool-uri', '')  -%}
+{% set wendelin_password = slapparameter_dict.get('wendelin-password', '')  -%}
+{% set wendelin_user = slapparameter_dict.get('wendelin-user', '')  -%}
+{% if wendelin_streamtool_uri and wendelin_password and wendelin_user -%}
+<match slapos.wendelin.networktest>
+  
+  @type wendelin
+  @id wendelin_out
+
+  streamtool_uri {{ wendelin_streamtool_uri }} 
+  user      {{ wendelin_user }}
+  password  {{ wendelin_password }}
+
+  buffer_type       memory
+  flush_interval    20s
+</match>
+{% endif -%}
+
+## SOURCE
+<source>
+  type forward
+</source>
+
+## live debugging agent
+<source>
+  type debug_agent
+  bind 127.0.0.1
+  port 24230
+</source>
+

software/monitor/instance-monitor-distributor.cfg.jinja2

-[buildout]
-
-extends = {{ instance_base_monitor }}
-parts += 
-  slave-test-configuration
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -20,15 +15,11 @@ extensions = jinja2.ext.do
 extra-context = 
   section slave_information slap-parameter
 
-[monitor-directory]
-network-user-logs = ${:private-directory}/network-user-logs/
-{% for slave_instance in slave_instance_list -%}
-user-log-{{ slave_instance.get('slave_reference') }}-folder = ${:private-directory}/network-user-logs/{{ slave_instance.get('slave_reference') }} 
-{% endfor -%}
-
 {% set part_list = [] -%}
 # Publish information for each slave
 
+{% set directory_list = [] -%}
+
 {% for slave_instance in slave_instance_list -%}
 {%   set publish_section_title = 'publish-%s' % slave_instance.get('slave_reference')  -%}
 {%   do part_list.append(publish_section_title) -%}
@@ -39,8 +30,79 @@ log-access-url = ${monitor-frontend:connection-site_url}/{{ slave_instance.get('
 log-access-url-v6 = ${monitor-parameters:url}/{{ slave_instance.get('slave_reference') }}
 {% endfor %}
 
+
+{% set data_source_dict = slapparameter_dict.get('data-source', None)  -%}
+{% set cron_min_count = 0 -%}
+{% if data_source_dict %}
+{% for entry in data_source_dict -%}
+{% set cron_min_count = cron_min_count + 1 -%}
+{% set cron_min = cron_min_count%60 -%}
+{% do part_list.append('cron-crawl-' + entry) -%}
+{% do directory_list.append(entry) -%}
+[cron-crawl-{{ entry }}]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = cron-crawler-{{ entry }}
+frequency = * * * * *
+command = cd ${monitor-directory:crawl-log}/{{ entry }} && ${crawler-bin:wrapper-path} {{ data_source_dict.get(entry) }} 
+{% endfor %}
+{% endif %}
+
+[monitor-directory]
+fluentd-log = ${:log}/fluentd
+crawl-log = ${:srv}/crawlog
+network-user-logs = ${:private-directory}/network-user-logs/
+{% for slave_instance in slave_instance_list -%}
+user-log-{{ slave_instance.get('slave_reference') }}-folder = ${:private-directory}/network-user-logs/{{ slave_instance.get('slave_reference') }}
+user-log-{{ slave_instance.get('slave_reference') }}-ping-folder = ${:private-directory}/network-user-logs/{{ slave_instance.get('slave_reference') }}/ping
+user-log-{{ slave_instance.get('slave_reference') }}-ping6-folder = ${:private-directory}/network-user-logs/{{ slave_instance.get('slave_reference') }}/ping6
+
+{% endfor -%}
+{% for directory in directory_list %}
+{{ '%s = ${:crawl-log}/%s' % (directory, directory) }}
+{% endfor %}
+
+
+[crawler-bin]
+recipe = slapos.cookbook:wrapper
+command-line = 
+  {{ wget_bin }} --no-check-certificate -l1 -r -nd --timestamp  
+wrapper-path = ${monitor-directory:bin}/log-crawler
+parameters-extra = true
+
 [buildout]
+extends = {{ instance_base_monitor }}
 parts +=
+  slave-test-configuration
+  fluentd-wrapper
 {% for part in part_list %}
 {{ '  %s' % part }}
 {% endfor %}
+
+[fluentd-wrapper]
+recipe = slapos.cookbook:wrapper
+command-line = {{ fluentd_location }}/bin/fluentd -l ${monitor-directory:log}/fluend.log -c ${fluentd-conf-configuration:rendered}
+wrapper-path = ${monitor-directory:service}/fluentd
+environment = 
+  GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
+
+[fluentd-conf-configuration]
+recipe = slapos.recipe.template:jinja2
+template = {{ fluent_conf_output }}
+rendered = ${monitor-directory:etc}/fluentd.cfg
+mode = 0744
+context =
+  key slapparameter_dict slap-configuration:configuration
+  key slave_instance_list slap-parameters:slave-instance-list
+  key fluentd_log_directory monitor-directory:fluentd-log
+  key crawl_log_directory monitor-directory:crawl-log
+  key network_user_logs monitor-directory:network-user-logs
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+

software/monitor/instance.cfg

@@ -19,8 +19,8 @@ context = key buildout buildout:bin-directory
           key develop_eggs_directory buildout:develop-eggs-directory
           key eggs_directory buildout:eggs-directory
           key slapparameter_dict slap-configuration:configuration
-          key monitor_template_output slap-configuration:monitor_template_output
-          key network_benck_cfg_output slap-configuration:network_benck_cfg_output 
+          raw monitor_template_output ${monitor-template:output}
+          raw network_benck_cfg_output ${network-bench-cfg:output} 
 mode = 0644
 
 [instance-base-distributor]
@@ -35,16 +35,16 @@ context = import json_module json
           key slapparameter_dict slap-configuration:configuration
           key instance_base_monitor instance-base-monitor:rendered
           key slave_instance_list slap-configuration:slave-instance-list 
-          key template_json_distributor_test slap-configuration:json_test_template
+          raw template_json_distributor_test ${json-test-template:destination} 
+          raw fluent_conf_output ${fluentd-agent-conf:output}
+          raw fluentd_location ${fluentd:location}
+          raw wget_bin ${wget:location}/bin/wget
 mode = 0644
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration
+recipe = slapos.cookbook:slapconfiguration.serialised
 computer = $${slap-connection:computer-id}
 partition = $${slap-connection:partition-id}
 url = $${slap-connection:server-url}
 key = $${slap-connection:key-file}
 cert = $${slap-connection:cert-file}
-monitor_template_output = ${monitor-template:output}
-network_benck_cfg_output = ${network-bench-cfg:output}
-json_test_template = ${json-test-template:destination}

software/monitor/software.cfg

@@ -2,11 +2,13 @@
 
 extends =
   ../../component/pycurl/buildout.cfg
+  ../../component/wget/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../component/fluentd/buildout.cfg
   ../../stack/slapos.cfg
 
 parts = 
+  wget
   slapos-cookbook
   slapos-toolbox
   network-bench-cfg
@@ -16,26 +18,27 @@ parts =
   template-monitor
   eggs
   fluentd
+  fluentd-agent-conf 
 
 [template]
 recipe = slapos.recipe.template 
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
-md5sum = 9225d232336515091191146cd34f30b9 
+md5sum = b38c5da7dd4165154a8817f76015e374
 mode = 0644
 
 [template-monitor]
 recipe = slapos.recipe.build:download 
 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
 destination = ${buildout:directory}/template-monitor.cfg
-md5sum = 810ed8199682068e27b62659d7fa101f
+md5sum = 810ed8199682068e27b62659d7fa101f 
 mode = 0644
 
 [template-monitor-distributor]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-monitor-distributor.cfg.jinja2
 destination = ${buildout:directory}/template-monitor-distributor.cfg
-md5sum = c012cf53a3f66c319db2a5d8226fa627 
+md5sum = d1253cf11c2b335b8bec5807e821d537 
 mode = 0644
 
 [json-test-template]
@@ -53,7 +56,7 @@ md5sum = 876f18b159fbd9325332d0f42e9172ac
 
 [monitor-httpd-template]
 url = ${:_profile_base_location_}/${:filename}
-md5sum = 25b5bfc7f9c2891c4a0923d6e08568a8 
+md5sum = 22133e9aa5f52d7818b2fd1fd0415a00 
 
 [network-bench-cfg]
 recipe = slapos.recipe.template
@@ -62,6 +65,13 @@ md5sum  = cfcbf2002b8eff5153e2bf68ed24b720
 output = ${buildout:directory}/template-network-bench-cfg.in
 mode = 0644
 
+[fluentd-agent-conf]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/fluentd-agent.conf.jinja2.in
+md5sum = c9da9f22a1cd1fedcf7d659cba916400 
+output = ${buildout:directory}/fluentd-agent.conf.jinja2.in
+mode = 0644
+
 [slapos-toolbox]
 recipe = zc.recipe.egg
 eggs =
@@ -73,8 +83,13 @@ scripts =
   networkbench
   onetimedownload
 
+[fluentd]
+gems += 
+  fluent-plugin-wendelin==0.1.alpha1
+  fluent-plugin-grep==0.3.4
+
 [eggs]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs = 
   cns.recipe.symlink
   slapos.cookbook
@@ -87,7 +102,6 @@ PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.7
-z3c.recipe.scripts = 1.0.1
 rubygemsrecipe = 0.2.1
 pycurl = 7.19.5.1
 
@@ -112,7 +126,7 @@ feedparser = 5.1.3
 
 # Required by:
 # slapos.toolbox==0.52
-paramiko = 1.15.2
+paramiko = 1.15.3
 
 # Required by:
 # slapos.toolbox==0.52
@@ -122,4 +136,3 @@ lockfile = 0.10.2
 # slapos.toolbox==0.52
 rpdb = 0.1.5
 
-

software/neoppod/instance-neo-admin.cfg.in

@@ -10,6 +10,7 @@ wrapper = ${directory:etc_run}/neoadmin
 logfile = ${directory:log}/neoadmin.log
 ip = ${publish:ip}
 port = ${publish:port-admin}
+ssl = {{ dumps(bool(slapparameter_dict['ssl'])) }}
 cluster = {{ dumps(slapparameter_dict['cluster']) }}
 masters = ${publish:masters}
 

software/neoppod/instance-neo-input-schema.json

@@ -35,6 +35,20 @@
       },
       "type": "object"
     },
+    "ssl": {
+      "description": "Enable SSL. All nodes look for 3 files in ~/etc: ca.crt, neo.crt, neo.key. Waiting that SlapOS provides a way to manage certificates, the user must deploy them manually, or use the temporary _ca/_cert/_key parameters.",
+      "default": true,
+      "type": "boolean"
+    },
+    "_ca": {
+      "type": "string"
+    },
+    "_cert": {
+      "type": "string"
+    },
+    "_key": {
+      "type": "string"
+    },
     "node-list": {
       "description": "List of dictionaries containing parameters for each node.",
       "items": {

software/neoppod/instance-neo-master.cfg.in

@@ -10,6 +10,7 @@ wrapper = ${directory:etc_run}/neomaster
 logfile = ${directory:log}/neomaster.log
 ip = ${publish:ip}
 port = ${publish:port-master}
+ssl = {{ dumps(bool(slapparameter_dict['ssl'])) }}
 cluster = {{ dumps(slapparameter_dict['cluster']) }}
 partitions = {{ slapparameter_dict['partitions'] }}
 replicas = {{ slapparameter_dict['replicas'] }}

software/neoppod/instance-neo-storage-mysql.cfg.in

@@ -41,7 +41,7 @@ context = section parameter_dict my-cnf-parameters
 [publish]
 recipe = slapos.cookbook:publish.serialised
 # TODO: make port a partition parameter
-ip = {{ (ipv4_set | list)[0] }}
+ip = {{ "[%s]" % list(ipv6_set)[0] if ipv6_set else list(ipv4_set)[0] }}
 {% set admin = slapparameter_dict.get('admin', 2050) -%}
 {% set master = slapparameter_dict.get('master', 2051) -%}
 {% if master -%}
@@ -61,10 +61,26 @@ masters = {{ ' '.join(sorted(master_list)) }}
 admins = {{ ' '.join(sorted(admin_list)) }}
 {%- endif %}
 
+{#- Hack to deploy SSL certs via instance parameters #}
+{%- for name, pem in zip(('ca.crt', 'neo.crt', 'neo.key'),
+                        slapparameter_dict['ssl']) %}
+{%-   if pem %}
+
+[{{ section(name) }}]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:etc}/{{name}}
+template = inline:{{'{{'}}pem}}
+context = key pem :pem
+pem = {{dumps(pem)}}
+{%-   endif %}
+{%- endfor %}
+{#- endhack #}
+
 [neo-storage]
 recipe = slapos.cookbook:neoppod.storage
 binary = {{ bin_directory }}/neostorage
 ip = ${publish:ip}
+ssl = {{ dumps(bool(slapparameter_dict['ssl'])) }}
 cluster = {{ dumps(slapparameter_dict['cluster']) }}
 masters = ${publish:masters}
 database-adapter = MySQL

software/neoppod/root-common.cfg.in

@@ -42,6 +42,11 @@ config-cluster = {{ parameter_dict['cluster'] }}
 {% set replicas = parameter_dict.get('replicas', 0) -%}
 config-partitions = {{ dumps(parameter_dict.get('partitions', 12)) }}
 config-replicas = {{ dumps(replicas) }}
+config-ssl = {{ dumps((
+  parameter_dict.get('_ca'),
+  parameter_dict.get('_cert'),
+  parameter_dict.get('_key'),
+  ) if parameter_dict.get('ssl', 1) else ()) }}
 config-upstream-cluster = {{ dumps(parameter_dict.get('upstream-cluster', '')) }}
 config-upstream-masters = {{ dumps(parameter_dict.get('upstream-masters', '')) }}
 software-type = {{ software_type }}

software/neoppod/software-common.cfg

@@ -13,27 +13,43 @@ extends =
 #LXML
     ../../component/lxml-python/buildout.cfg
 #END LXML
-    ../../component/python-2.7/buildout.cfg
-    ../../component/mariadb/buildout.cfg
     ../../component/mysql-python/buildout.cfg
+    ../../component/pycrypto-python/buildout.cfg
 
 parts =
+# keep neoppod first so that ZODB3 is built correctly,
+# before any other section that would depend on it
+    neoppod-develop
+    neoppod
     slapos-deps-eggs
     slapos-cookbook-develop
     slapos-cookbook
-# NEO & dependencies
-    python2.7
-    mariadb
-    mysql-python
-    neoppod
 
-[slapos.cookbook-repository]
-branch = erp5-cluster
+[neoppod-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/neoppod.git
+git-executable = ${git:location}/bin/git
+
+[neoppod-develop]
+recipe = zc.recipe.egg:develop
+setup = ${neoppod-repository:location}
+
+[neoppod]
+recipe = zc.recipe.egg
+eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
+  ${mysql-python:egg}
+  ZODB3
+ZODB3-patches =
+  ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch
+ZODB3-patch-options = -p1
 
 [slapos-deps-eggs]
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
+  ${python-PyYAML:egg}
+  ${pycrypto-python:egg}
+  ${python-cliff:egg}
   slapos.toolbox
 scripts =
   slapos-kill
@@ -74,32 +90,41 @@ context =
 
 [root-common]
 <= download-base-neo
-md5sum = 26193dbb132d340c8ba919a616449a17
+md5sum = f3259726bd5d824c569dc7db6b7d26a0
 
 [instance-neo-admin]
 <= download-base-neo
-md5sum = 16d11f0fe74de06aebbadcff3527db1c
+md5sum = f030a25d320f2edf0186b69bfa521228
 
 [instance-neo-master]
 <= download-base-neo
-md5sum = 023f08763dbba2319f58e5c597f7761d
+md5sum = 82f3f76f54ee9db355966a7ada61f56e
 
 [instance-neo-storage-mysql]
 <= download-base-neo
-md5sum = 5a61039c7a980e24519e1bbb1252e662
+md5sum = 84b1150ce30ec827485f9c17debd6b44
 
 [template-neo-my-cnf]
 <= download-base-neo
 url = ${:_profile_base_location_}/my.cnf.in
 md5sum = febd3ed58043ce1367b86cf6e4e69700
 
-[neoppod]
-recipe = zc.recipe.egg
-eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
-  ZODB3
-ZODB3-patches = ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch
-ZODB3-patch-options = -p1
-
 [versions]
-# patched eggs
+MySQL-python = 1.2.5
+slapos.recipe.template = 2.8
+# patched egg
 ZODB3 = 3.10.5+SlapOSPatched001
+# Required by slapos.toolbox==0.52
+slapos.toolbox = 0.52
+apache-libcloud = 0.18.0
+atomize = 0.2.0
+ecdsa = 0.13
+feedparser = 5.2.1
+GitPython = 1.0.1
+gitdb = 0.6.4
+lockfile = 0.10.2
+paramiko = 1.15.3
+pycrypto = 2.6.1
+rpdb = 0.1.5
+smmap = 0.9.0
+##

software/neoppod/software.cfg

@@ -20,3 +20,12 @@ context =
 [cluster]
 <= download-base-neo
 md5sum = ee8401a4e7d82bf488a57e3399f9ce48
+
+[versions]
+# To match ERP5
+transaction = 1.1.1
+ZConfig = 2.9.1
+zc.lockfile = 1.0.2
+zdaemon = 2.0.7
+zope.event = 3.5.2
+##

software/powerdns/software.cfg

@@ -62,6 +62,5 @@ mode = 0644
 [versions]
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
-collective.recipe.template = 1.11
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.7
+slapos.recipe.template = 2.8

software/re6stnet/software.cfg

@@ -164,7 +164,7 @@ miniupnpc = 1.9
 
 # Required by:
 # slapos.toolbox==0.47.3
-paramiko = 1.15.2
+paramiko = 1.15.3
 
 # Required by:
 # slapos.toolbox==0.47.3

software/slapos-in-partition/common.cfg

@@ -52,7 +52,7 @@ context =
 
 [slapos-configuration-file-template]
 # Download the template of slapos.cfg
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/slapos.cfg.in
 #md5sum = 
 target = ${buildout:directory}/slapos.cfg.in
@@ -61,7 +61,7 @@ mode = 0644
 
 [httpd-configuration-file-template]
 # Download the template of httpd.conf
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/httpd.conf.in
 mode = 0644
 #md5sum = 

software/slapos-in-partition/software.cfg

@@ -11,5 +11,4 @@ extends = common.cfg
 Pygments = 1.6
 collective.recipe.environment = 0.2.0
 collective.recipe.template = 1.10
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.7

software/slapos-master/software.cfg

@@ -29,7 +29,7 @@ git-executable = ${git:location}/bin/git
 
 [vifib]
 recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.cn/nexedi/slapos.core.git
+repository = https://lab.nexedi.com/nexedi/slapos.core.git
 branch = master
 git-executable = ${git:location}/bin/git
 

software/slapos-testing/software.cfg

@@ -50,23 +50,23 @@ repository = http://git.erp5.org/repos/slapos.git
 
 [slapos.core-repository]
 <= git-clone-repository
-repository = https://lab.nexedi.cn/nexedi/slapos.core.git
+repository = https://lab.nexedi.com/nexedi/slapos.core.git
 
 [slapos.package-repository]
 <= git-clone-repository
-repository = http://git.erp5.org/repos/slapos.package.git
+repository = https://lab.nexedi.com/nexedi/slapos.package.git
 
 [slapos.recipe.template-repository]
 <= git-clone-repository
-repository = http://git.erp5.org/repos/slapos.recipe.template.git
+repository = https://lab.nexedi.com/nexedi/slapos.recipe.template.git
 
 [slapos.recipe.build-repository]
 <= git-clone-repository
-repository = http://git.erp5.org/repos/slapos.recipe.build.git
+repository = https://lab.nexedi.com/nexedi/slapos.recipe.build.git
 
 [slapos.recipe.cmmi-repository]
 <= git-clone-repository
-repository = http://git.erp5.org/repos/slapos.recipe.cmmi.git
+repository = https://lab.nexedi.com/nexedi/slapos.recipe.cmmi.git
 
 [erp5-util-repository]
 <= git-clone-repository

software/slaprunner/common.cfg

@@ -88,7 +88,7 @@ md5sum = 994e355d713f90bcc17e4b54da65f354
 mode = 0644
 
 [template-resilient]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
 md5sum = aa9a99235571729ab93360c4712efa12
 filename = instance-resilient.cfg.jinja2
@@ -119,7 +119,7 @@ filename = httpd_conf.in
 mode = 0644
 
 [template_launcher]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/launcher.in
 md5sum = 525e37ea8b2acf6209869999b15071a6
 filename = launcher.in
@@ -190,7 +190,7 @@ filename = monitor-check-webrunner-internal-instances.py
 mode = 0644
 
 [eggs]
-recipe = z3c.recipe.scripts
+recipe = zc.recipe.egg
 eggs =
   collective.recipe.environment
   cns.recipe.symlink

software/slaprunner/development.cfg

@@ -16,7 +16,7 @@ parts =
 
 [slapos.toolbox-repository]
 recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.cn/nexedi/slapos.toolbox.git
+repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git
 branch = slaprunner-paas
 git-executable = ${git:location}/bin/git
 develop = true
@@ -53,7 +53,7 @@ setup = ${erp5.util-repository:location}
 
 [slapos.core-repository]
 recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.cn/nexedi/slapos.core.git
+repository = https://lab.nexedi.com/nexedi/slapos.core.git
 branch = master
 git-executable = ${git:location}/bin/git
 develop = true
@@ -67,3 +67,5 @@ setup = ${slapos.core-repository:location}
 slapos.cookbook =
 slapos.core =
 slapos.toolbox =
+# XXX Fix lockfile 0.11.0 requirement (pbr!=0.7,<1.0,>=0.6)
+lockfile = 0.10.2

software/slaprunner/software.cfg

@@ -12,15 +12,12 @@ PyRSS2Gen = 1.1
 apache-libcloud = 0.18.0
 cns.recipe.symlink = 0.2.3
 collective.recipe.environment = 0.2.0
-collective.recipe.template = 1.12
 ecdsa = 0.13
 erp5.util = 0.4.43
 gitdb = 0.6.4
 gunicorn = 19.3.0
-plone.recipe.command = 1.1
 prettytable = 0.7.2
 pycrypto = 2.6.1
-slapos.recipe.download = 1.0.dev-r3447
 slapos.recipe.template = 2.8
 slapos.toolbox = 0.52
 smmap = 0.9.0
@@ -43,7 +40,7 @@ lockfile = 0.10.2
 
 # Required by:
 # slapos.toolbox==0.52
-paramiko = 1.15.2
+paramiko = 1.15.3
 
 # Required by:
 # slapos.toolbox==0.52

software/test-slave-instance-deployment/software.cfg

@@ -69,7 +69,6 @@ download-cache =
 # Generate list of automatically chosen eggs version
 extensions +=
   buildout-versions
-  mr.developer
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =

software/unstable/MediaWiki/software.cfg

@@ -16,7 +16,7 @@ extends =
   ../../stack/lamp.cfg
 
 [mediawiki-patch]
-recipe = slapos.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/patch/mediawiki-1.17.0.config.patch
 md5sum = fd606666ac9fc54cb84cda8cf08edef4
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -62,7 +62,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 

software/unstable/b2evolution/software.cfg

@@ -47,7 +47,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10
 

software/unstable/cmsmadesimple/software.cfg

@@ -46,7 +46,6 @@ meld3 = 0.6.7
 plone.recipe.command = 1.1
 slapos.cookbook = 0.34
 slapos.recipe.build = 0.7
-slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.2
 slapos.toolbox = 0.10