Merge branch 'master' into erp5-cluster

Conflicts:
	stack/erp5/buildout.cfg
	stack/erp5/instance-erp5-cluster.cfg.in
	stack/erp5/instance-erp5-single.cfg.in
	stack/monitor/buildout.cfg

README.software.txt

+Instance descriptors
+====================
+
+.. contents::
+
+Abstract
+--------
+
+Instances generated from software release take parameters (typically to
+customise instantiation and instance behaviour) and publish results
+(typically allowing access to requester). This also applies not only to
+the root software instance, but to any instance requested by another
+instance.
+
+The structure of these values is constrained by how the Software Release
+was implemented, and must be documented so it can be used. Instance
+descriptors are intended to provide such documentation in a form
+allowing automated generation of a user interface to consult and provide
+parameters, and to consult published results.
+
+Specification
+-------------
+
+Instance parameters (=requests) and published results (=responses) are
+specified using json schemas, as defined in the following resources:
+
+- http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.20
+- http://tools.ietf.org/html/draft-zyp-json-schema-04
+- http://json-schema.org/
+
+These schema MUST ignore any technical overhead, such as
+serialisation-format-imposed layers (such as
+``<?xml ...?><instance></instance>`` level in ``xml`` serialisation,
+or the ``<prameter id="_">`` level in ``json-in-xml`` serialisation).
+
+Rules to define access to request & response schemas for a given
+software release and software type should be provided in a file whose
+name is deduced from the software release URL by appending ".json" to
+its path component. Components preceding path (scheme & netloc) MUST
+be preserved, components succeeding path (query & fragment) SHOULD be
+preserved. If a file actually resides at such URL, it MUST be valid
+json syntax and satisfy the following json schema::
+
+  {
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "Slapos Software Release instantiation descriptor",
+    "additionalProperties": false,
+    "properties": {
+      "name": {
+        "description": "A short human-friendly name for the sofware release",
+        "type": "string"
+      },
+      "description": {
+        "description": "A short description of the sofware release",
+        "type": "string"
+      },
+      "serialisation": {
+        "description": "How the parameters and results are serialised",
+        "required": true,
+        "enum": ["xml", "json-in-xml"],
+        "type": "string"
+      },
+      "software-type": {
+        "description": "Existing software types",
+        "required": true,
+        "patternProperties": {
+          ".*": {
+            "description": "Software type declaration",
+            "additionalProperties": false,
+            "properties": {
+              "description": {
+                "description": "A human-friendly description of the software type",
+                "type": "string"
+              },
+              "serialisation": {
+                "description": "How the parameters and results are serialised, if different from global setting",
+                "enum": ["xml", "json-in-xml"],
+                "type": "string"
+              },
+              "request": {
+                "required": true,
+                "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+                "type": "string"
+              },
+              "response": {
+                "required": true,
+                "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+                "type": "string"
+              },
+              "index": {
+                "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+                "type": "any"
+              }
+            },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      }
+    },
+    "type": "object"
+  }
+
+Error handling
+--------------
+
+If instantiation descriptor does not exist, is not valid json or does
+not conform to this schema, it is ignored and a fall-back
+representation is used. Likewise, if a software type of an existing
+instance is not defined in software-type object or referenced schema
+does not exist or is invalid, the same fall-back representation is used
+for considered software type.
+
+A fall-back representation must allow full control to the user, without
+any guided editing: user is expected to serialise on his own and
+provides & receives raw strings as request and responses, respectively.
+
+Request schemas, when present and valid, MAY be used to validate user
+input.
+
+It SHOULD be made possible for user to violate the schema just as it is
+possible for existing instances to already violate schemas. These
+violation should be represented in a way which makes as much sense as
+possible: displaying recursively all object properties and iteratively
+all list items with as appropriate as possible fields, with a fall-back
+on free text input. These extra fields generated from existing data or
+created on-the-fly by the user MUST NOT prevent schema-conforming
+fields from being displayed and functional.
+

component/accords/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../git/buildout.cfg
+  ../openssl/buildout.cfg
+  ../libuuid/buildout.cfg
+
+parts = accords
+
+[accords-source]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.gitorious.ow2.org/ow2-compatibleone/accords-platform.git
+
+[accords]
+# Part of Compatible One project
+# http://gitorious.ow2.org/ow2-compatibleone/accords-platform
+recipe = hexagonit.recipe.cmmi
+#url = http://gitorious.ow2.org/ow2-compatibleone/accords-platform/archive-tarball/master
+path = ${accords-source:location}/
+#md5sum = 
+# Replaces autogen.sh
+configure-command =
+  ./clean
+  libtoolize -c -f
+  aclocal -I ${libtool:location}/share/aclocal
+  automake -c -a -f --add-missing
+  autoreconf --install
+  ./configure
+configure-options =
+  --with-ssl=${openssl:location}
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
+  LDFLAGS =-Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
+  LIBTOOL=libtool
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+
+# Accords makefile does not install necessary scripts. Let's copy it
+[accords-scripts]
+recipe = plone.recipe.command
+requires = ${accords:location}
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+origin = ${accords-source:location}/scripts
+destination = ${:location}
+command = ([ -e ${:origin}/co-broker ] && [ ! -e ${:destination}/co-broker ] && mkdir ${:destination} && cp -r ${:origin} ${:destination})

component/apache/buildout.cfg

@@ -109,9 +109,9 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.27
+version = 2.2.29
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
+md5sum = 579342fdeaa7b8b68d17fee91f8fab6e
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/bash/buildout.cfg

@@ -9,6 +9,35 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
 md5sum = 81348932d5da294953e15d4814c74dd1
+patches =
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-001#1ab682b4e36afa4cf1b426aa7ac81c0d
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-002#8fc22cf50ec85da00f6af3d66f7ddc1b
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-003#a41728eca78858758e26b5dea64ae506
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-004#bf8d53d227829d67235927689a03cc7a
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-005#c0c00935c8b8ffff76e8ab77e7be7d15
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-006#6f01e364cd092faa28dd7119f47ddb5f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-007#dcf471d222bcd83283d3094e6ceeb6f8
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-008#f7553416646dc26c266454c78a916d36
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-009#7e73d2151f4064b484a4ba2c4b09960e
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-010#a275463d21735bb6d7161f9fbd320d8f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-011#c17103ee20420d77e46b224c8d3fceda
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-012#3e2a057a19d02b3f92a3a09eacbc03ae
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-013#fb377143a996d4ff087a2771bc8332f9
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-014#1a1aaecc99a9d0cbc310e8e247dcc8b6
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-015#4f04387458a3c1b4d460d199f49991a8
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-016#90e759709720c4f877525bebc9d5dc06
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-017#11e4046e1b86070f6adbb7ffc89641be
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-018#cd5a9b46f5bea0dc0248c93c7dfac011
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-019#cff4dc024d9d3456888aaaf8a36ca774
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-020#167839c5f147347f4a03d88ab97ff787
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-021#1d350671c48dec30b34d8b81f09cd79d
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-022#11c349af66a55481a3215ef2520bec36
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-023#b3cb0d80fd0c47728264405cbb3b23c7
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-024#b5ea5600942acceb4b6f07313d2de74e
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-025#193c06f578d38ffdbaebae9c51a7551f
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-026#922578e2be7ed03729454e92ee8d3f3a
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-027#8ff6948b16f2db5c29b1b9ae1085bbe7
+  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-028#dd51fa67913b5dca45a702b672b3323f
 configure-options =
   --with-curses
 environment =

component/cloudooo/buildout.cfg

@@ -5,14 +5,9 @@ extends =
 parts =
   cloudooo
 
-develop +=
-  ${:parts-directory}/cloudooo-repository
-
-[cloudooo-check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
+[cloudooo-develop]
+recipe = zc.recipe.egg:develop
+setup = ${cloudooo-repository:location}
 
 [cloudooo-repository]
 recipe = slapos.recipe.build:gitclone
@@ -22,7 +17,6 @@ git-executable = ${git:location}/bin/git
 
 [cloudooo]
 recipe = zc.recipe.egg
-extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
   PasteScript
@@ -39,4 +33,3 @@ scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
   runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}

component/curl/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.37.1.tar.bz2
-md5sum = 95c627abcf6494f5abe55effe7cd6a57
+url = http://curl.haxx.se/download/curl-7.38.0.tar.bz2
+md5sum = af6b3c299bd891f43cb5f76c4091b7b4
 configure-options =
   --disable-static
   --disable-ldap

component/dbus/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [dbus]
 recipe = slapos.recipe.cmmi
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.6.tar.gz
-md5sum = 6a08ba555d340e9dfe2d623b83c0eea8
+url = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.8.tar.gz
+md5sum = b9f4a18ee3faa1e07c04aa1d83239c43
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
   --disable-static

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 30.0
+version = 32.0
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 469be1f0aaf537f16e17c324bb5baa6b
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 a4979b84a7d68f77d4109282a468f041
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 f086b7d0ac2421232d5cb31857980d2e
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ec3b3976caa4ec5b3de137d059c74f8d
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/gcc/buildout.cfg

@@ -32,69 +32,81 @@ environment =
 
 [ppl]
 recipe = slapos.recipe.cmmi
-# we should use version 0.10.x for gcc-4.5
-url = http://bugseng.com/products/ppl/download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2
-md5sum = 5667111f53150618b0fa522ffc53fc3e
+# we should use version 0.11.x for gcc-4.7
+url = http://bugseng.com/external/ppl/download/ftp/releases/0.11/ppl-0.11.tar.bz2
+md5sum = c414abd2ecaf1f1f48949c78d383ee1a
+patches =
+  ${:_profile_base_location_}/ppl-0.11-gcc-4.9.patch#09e00eefba5f8e6e77a9c9c611fccc64
+
 configure-options =
-  --with-libgmp-prefix=${gmp-4:location}
-  --with-libgmpxx-prefix=${gmp-4:location}
+  --with-gmp=${gmp-4:location}
+  --with-gmp-prefix=${gmp-4:location}
   --disable-static
 environment =
   PATH=${m4:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib
+  CXXFLAGS=-fpermissive
+
 
 [cloog-ppl]
 recipe = slapos.recipe.cmmi
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
-md5sum = 806e001d1b1a6b130069ff6274900af5
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-0.16.1.tar.gz
+md5sum = 947123350d1ff6dcb4b0774947ac015a
 configure-options =
-  --with-gmp=${gmp-4:location}
+  --with-gmp-prefix=${gmp-4:location}
   --with-ppl=${ppl:location}
   --disable-static
 environment =
   PATH=${m4:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib
 
-[gcc]
+[gcc-common]
 recipe = slapos.recipe.cmmi
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
-patches =
-  ${:_profile_base_location_}/gcc-multiarch.patch#819e6735270c8a432b0512b49f40219f
-patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
+url = http://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2
+md5sum = 4c696da46297de6ae77a82797d2abe28
+# make install does not work when several core are used
+make-targets = install -j1
+
+[gcc]
+<= gcc-common
 configure-options =
   --disable-bootstrap
-  --enable-languages="c,c++"
   --disable-multilib
   --with-gmp=${gmp-4:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
+  --enable-languages="c,c++"
   --with-ppl=${ppl:location}
   --with-cloog=${cloog-ppl:location}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --enable-cloog-backend=isl
 environment =
   LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
 
 [gcc-minimal]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/gcc/gcc-4.5.4/gcc-core-4.5.4.tar.bz2
-md5sum = ca62e442629a9a7710f5d797bf1b521c
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-patch-options = -p2
+<= gcc-common
 configure-options =
   --disable-bootstrap
-  --enable-languages=c
   --disable-multilib
   --with-gmp=${gmp-4:location}
   --with-mpfr=${mpfr:location}
   --with-mpc=${mpc:location}
+  --enable-languages=c
   --without-ppl
   --without-cloog
 environment =
   LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib
-# make install does not work when several core are used
-make-targets = install -j1
+
+[gcc-fortran]
+<= gcc-common
+configure-options =
+  --disable-bootstrap
+  --disable-multilib
+  --with-gmp=${gmp-4:location}
+  --with-mpfr=${mpfr:location}
+  --with-mpc=${mpc:location}
+  --enable-languages="c,c++,fortran"
+  --with-ppl=${ppl:location}
+  --with-cloog=${cloog-ppl:location}
+  --enable-cloog-backend=isl
+environment =
+  LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${ppl:location}/lib -Wl,-rpath=${cloog-ppl:location}/lib

component/gcc/gcc-multiarch.patch

-# DP: Add multiarch support to GCC.
-# DP:
-# DP: Convert the multilib option to a target triplet,
-# DP: add multiarch include directories and libraries path:
-# DP:	/usr/local/include/<arch>-linux-gnu
-# DP:	/usr/include/<arch>-linux-gnu
-# DP:	/usr/lib/<arch>-linux-gnu
-# DP: to the system paths.
-# DP:
-# DP: Original patch:
-# DP: http://anonscm.debian.org/viewvc/gcccvs/branches/sid/gcc-4.5/debian/patches/gcc-multiarch.diff?revision=5086&view=co
-
-2011-08-05 Arnaud Fontaine <arnaud.fontaine@nexedi.com>
-	* Enable multiarch unconditionally.
-
-2011-03-08  Steve Langasek <steve.langasek@linaro.org>
-	* Canonicalize x86 to i386 everywhere, not i486/i686
-
-2009-03-24  Arthur Loiret  <aloiret@debian.org>
-
-	* configure.ac: Handle --enable-multiarch and --with-multiarch-defaults.
-	* config.gcc: Define MULTIARCH_DEFAULTS if multiarch is enabled.
-	* config.in [!USED_FOR_TARGET]: Undef ENABLE_MULTIARCH.
-	* gcc.c: include multiarch.h.
-	(set_multiarch_dir): New function. Adds the multiarch directories to
-	the library path.
-	[ENABLE_MULTIARCH]: Use it.
-	* cppdefault.c [LOCAL_INCLUDE_DIR, STANDARD_INCLUDE_DIR] Add an include
-	directory for multiarch directories.
-	* incpath.c: include multiarch.h
-	[ENABLE_MULTIARCH]: Add the multiarch directory to include directories.
-	* Makefile.in (MULTIARCH_H): New. Use it for incpath.o and gcc.o.
-	* multiarch.h: New file.
----
- gcc/Makefile.in  |    7 ++--
- gcc/config.gcc   |    9 +++++
- gcc/config.in    |    4 ++
- gcc/configure.ac |   13 ++++++++
- gcc/cppdefault.c |    6 +++
- gcc/gcc.c        |   41 ++++++++++++++++++++++++
- gcc/incpath.c    |   28 ++++++++++++++++
- gcc/multiarch.h  |   91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 8 files changed, 196 insertions(+), 3 deletions(-)
-
---- a/src/gcc/gcc.c.orig	2009-12-20
-+++ b/src/gcc/gcc.c	2009-12-20
-@@ -71,6 +71,7 @@
- #include "system.h"
- #include "coretypes.h"
- #include "multilib.h" /* before tm.h */
-+#include "multiarch.h"
- #include "tm.h"
- #include <signal.h>
- #if ! defined( SIGCHLD ) && defined( SIGCLD )
-@@ -375,6 +376,7 @@
- static int used_arg (const char *, int);
- static int default_arg (const char *, int);
- static void set_multilib_dir (void);
-+static void set_multiarch_dir (void);
- static void print_multilib_info (void);
- static void perror_with_name (const char *);
- static void fatal_ice (const char *, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
-@@ -7354,6 +7358,9 @@
-       xputenv (XOBFINISH (&collect_obstack, char *));
-     }
- 
-+  /* Add the multiarch directories to libraries path.  */
-+  set_multiarch_dir ();
-+
-   /* Warn about any switches that no pass was interested in.  */
- 
-   for (i = 0; (int) i < n_switches; i++)
-@@ -8515,6 +8524,25 @@
-     multilib_os_dir = multilib_dir;
- }
- 
-+/* Add the multiarch directories to libraries path. This uses the converted
-+   multiarch triplet from the multilib value.
-+   For example, if the target supports -m32/-m64 as multilib option and
-+   defaults to 64, it will add /usr/lib/$triplet_target64/lib to library
-+   path if either -m64 or no multilib option at all is set. And it will
-+   add /usr/lib/$triplet_target32 if -m32 is set. Triplets are defined in
-+   multiarch.def.  */
-+
-+static void
-+set_multiarch_dir (void)
-+{
-+  const char *path;
-+
-+  path = concat (STANDARD_STARTFILE_PREFIX_2, MULTIARCH_DEFAULTS,
-+    dir_separator_str, NULL);
-+  add_prefix (&startfile_prefixes, path, NULL,
-+    PREFIX_PRIORITY_LAST, 0, 1);
-+}
-+
- /* Print out the multiple library subdirectory selection
-    information.  This prints out a series of lines.  Each line looks
-    like SUBDIRECTORY;@OPTION@OPTION, with as many options as is
---- a/src/gcc/config.gcc.orig	2009-12-20
-+++ b/src/gcc/config.gcc	2009-12-20
-@@ -3371,3 +3371,10 @@
- 		target_cpu_default=$target_cpu_default2
- 	fi
- fi
-+
-+multiarch_defaults=`echo ${target_noncanonical} | sed -e 's/unknown-//'`
-+multiarch_define="__`echo ${multiarch_defaults} | tr '-' '_'`__"
-+if test x${with_multiarch_defaults} != x; then
-+	multiarch_defaults=${with_multiarch_defaults}
-+fi
-+tm_defines="${tm_defines} ${multiarch_define}=1 MULTIARCH_DEFAULTS=\\\"${multiarch_defaults}\\\""
---- a/src/gcc/Makefile.in.orig	2009-12-20
-+++ b/src/gcc/Makefile.in	2009-12-20
-@@ -949,6 +949,7 @@
- 		$(HASHTAB_H)
- PLUGIN_H = plugin.h $(GCC_PLUGIN_H)
- PLUGIN_VERSION_H = plugin-version.h configargs.h
-+MULTIARCH_H = multiarch.h
- 
- #
- # Now figure out from those variables how to compile and link.
-@@ -1955,8 +1956,8 @@
- 	-cp -p $^ $(srcdir)
- 
- incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
--		intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
--		$(MACHMODE_H)
-+		intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(MULTIARCH_H) \
-+		$(TARGET_H) $(MACHMODE_H)
- 
- c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
-     $(RTL_H) $(C_TREE_H) $(GGC_H) $(TARGET_H) $(FLAGS_H) $(FUNCTION_H) output.h \
-@@ -2107,7 +2108,7 @@
- 
- gcc.o: gcc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) intl.h multilib.h \
-     Makefile $(lang_specs_files) specs.h prefix.h $(GCC_H) $(FLAGS_H) \
--    configargs.h $(OBSTACK_H) opts.h
-+    configargs.h $(OBSTACK_H) opts.h $(MULTIARCH_H)
- 	(SHLIB_LINK='$(SHLIB_LINK)'; \
- 	$(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \
-   $(DRIVER_DEFINES) \
---- a/src/gcc/incpath.c.orig	2009-11-30
-+++ b/src/gcc/incpath.c	2009-12-20
-@@ -30,6 +30,7 @@
- #include "intl.h"
- #include "incpath.h"
- #include "cppdefault.h"
-+#include "multiarch.h"
- 
- /* Microsoft Windows does not natively support inodes.
-    VMS has non-numeric inodes.  */
-@@ -132,6 +133,7 @@
-   const struct default_include *p;
-   int relocated = cpp_relocated();
-   size_t len;
-+  const char *multiarch;
- 
-   if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
-     {
-@@ -150,8 +154,15 @@
- 	      if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
- 		{
- 		  char *str = concat (iprefix, p->fname + len, NULL);
-+		  if (p->multilib == 1 && imultilib)
-+		    str = concat (str, dir_separator_str, imultilib, NULL);
-+		  else if (p->multilib == 2)
-+		    {
-+		      multiarch = multilib_to_multiarch (imultilib);
-+		      if (!multiarch)
-+			continue;
-+		      str = concat (str, dir_separator_str, multiarch, NULL);
-+		    }
--		  if (p->multilib && imultilib)
--		    str = concat (str, dir_separator_str, imultilib, NULL);
- 		  add_path (str, SYSTEM, p->cxx_aware, false);
- 		}
- 	    }
-@@ -195,8 +211,15 @@
- 	  else
- 	    str = update_path (p->fname, p->component);
- 
-+	  if (p->multilib == 1 && imultilib)
-+	    str = concat (str, dir_separator_str, imultilib, NULL);
-+	  else if (p->multilib == 2)
-+	    {
-+	      multiarch = multilib_to_multiarch (imultilib);
-+	      if (!multiarch)
-+		continue;
-+	      str = concat (str, dir_separator_str, multiarch, NULL);
-+	    }
--	  if (p->multilib && imultilib)
--	    str = concat (str, dir_separator_str, imultilib, NULL);
- 
- 	  add_path (str, SYSTEM, p->cxx_aware, false);
- 	}
---- a/src/gcc/multiarch.h.orig	2009-12-20
-+++ b/src/gcc/multiarch.h	2009-12-20
-@@ -0,0 +1,93 @@
-+/* Header for multiarch handling (include directories, libraries path).
-+   Copyright (C) 2009 Free Software Foundation, Inc.
-+   Contributed by Arthur Loiret <aloiret@debian.org>
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#ifndef GCC_MULTIARCH_H
-+#define GCC_MULTIARCH_H
-+
-+#include "tm.h"
-+
-+struct multiarch_mapping
-+{
-+  const char *const multilib;
-+  const char *const multiarch;
-+};
-+
-+const struct multiarch_mapping multiarch_mappings[] = {
-+  { "", MULTIARCH_DEFAULTS },
-+# if defined(__x86_64_linux_gnu__)
-+  { "32",  "i386-linux-gnu" },
-+# endif
-+# if defined(__i486_linux_gnu__) || defined(__i686_linux_gnu__)
-+  { "64",  "x86_64-linux-gnu" },
-+# endif
-+# if defined(__powerpc64_linux_gnu__)
-+  { "32",  "powerpc-linux-gnu" },
-+# endif
-+# if defined(__powerpc_linux_gnu__)
-+  { "64",  "powerpc64-linux-gnu" },
-+# endif
-+# if defined(__sparc64_linux_gnu__)
-+  { "32",  "sparc-linux-gnu" },
-+# endif
-+# if defined(__sparc_linux_gnu__)
-+  { "64",  "sparc64-linux-gnu" },
-+# endif
-+# if defined(__s390x_linux_gnu__)
-+  { "31",  "s390-linux-gnu" },
-+# endif
-+# if defined(__s390_linux_gnu__)
-+  { "64",  "s390x-linux-gnu" },
-+# endif
-+# if defined(__mips_linux_gnu__)
-+  { "n32",  "mips64-linux-gnuabin32" },
-+  { "64",  "mips64-linux-gnuabi64" },
-+# endif
-+# if defined(__mipsel_linux_gnu__)
-+  { "n32",  "mips64el-linux-gnuabin32" },
-+  { "64",  "mips64el-linux-gnuabi64" },
-+# endif
-+# if defined(__x86_64_kfreebsd_gnu__)
-+  { "32",  "i386-kfreebsd-gnu" },
-+# endif
-+# if defined(__sh4_linux_gnu__)
-+  { "m4",  "sh4-linux-gnu" },
-+  { "m4-nofpu",  "sh4_nofpu-linux-gnu" },
-+# endif
-+  { 0, 0 }
-+};
-+
-+/* Convert the multilib option to the corresponding target triplet.
-+   See multiarch.def and config.gcc for multilib/multiarch pairs.
-+   When the default multilib is used, the corresponding multilib/multiarch
-+   pair is { "", $target_tripplet }.  */
-+static inline const char*
-+multilib_to_multiarch (const char *imultilib)
-+{
-+  const struct multiarch_mapping *p;
-+
-+  for (p = multiarch_mappings; p->multiarch; p++)
-+    {
-+      if (!strcmp(p->multilib, imultilib ? imultilib : ""))
-+	return p->multiarch;
-+    }
-+  return NULL;
-+}
-+
-+#endif /* GCC_MULTIARCH_H */
---- a/src/gcc/cppdefault.c.orig	2008-07-21
-+++ b/src/gcc/cppdefault.c	2009-12-20
-@@ -60,6 +60,7 @@
- #endif
- #ifdef LOCAL_INCLUDE_DIR
-     /* /usr/local/include comes before the fixincluded header files.  */
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
-     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
- #endif
- #ifdef PREFIX_INCLUDE_DIR
-@@ -95,6 +98,7 @@
- #endif
- #ifdef STANDARD_INCLUDE_DIR
-     /* /usr/include comes dead last.  */
-+    { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1, 2 },
-     { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1, 0 },
- #endif
-     { 0, 0, 0, 0, 0, 0 }

component/gcc/ppl-0.11-gcc-4.9.patch

+# HG changeset patch
+# User Bernhard Walle <bernhard@bwalle.de>
+# Date 1399806036 -7200
+#      Sun May 11 13:00:36 2014 +0200
+# Node ID 5632a171e7c1dc4c0fb5c7a8352afb4188cd29d5
+# Parent  e35fa03cd2043496839aa5fa3a1a3d2d375b5535
+complibs/ppl: Fix build of ppl 0.11.2 with gcc 4.9
+
+  From: Roberto Bagnara <bagnara@cs.unipr.it>
+  Date: Tue, 29 Apr 2014 19:51:43 +0000 (+0200)
+  Subject: Added missing inclusions.  Use std::ptrdiff_t.
+  X-Git-Url: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl%2Fppl.git;a=commitdiff_plain;h=61d4e14dfd9f1121e9b4521dead5728b2424dd7c
+
+  Added missing inclusions.  Use std::ptrdiff_t.
+  (Thanks to Paulo Cesar Pereira de Andrade.)
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+
+diff -r e35fa03cd204 -r 5632a171e7c1 patches/ppl/0.11.2/500-ptrdiff_t.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/ppl/0.11.2/500-ptrdiff_t.patch	Sun May 11 13:00:36 2014 +0200
+@@ -0,0 +1,95 @@
++From: Bernhard Walle <bernhard@bwalle.de>
++Subject: Fix compilation with gcc 4.9 (ptrdiff_t errors)
++
++This is a backport of following patch in ppl git
++
++  commit 61d4e14dfd9f1121e9b4521dead5728b2424dd7c
++  Author: Roberto Bagnara <bagnara@cs.unipr.it>
++  Date:   Tue Apr 29 21:51:43 2014 +0200
++
++      Added missing inclusions.  Use std::ptrdiff_t.
++      (Thanks to Paulo Cesar Pereira de Andrade.)
++
++---
++ src/Congruence_System.defs.hh     |    3 ++-
++ src/Constraint_System.defs.hh     |    3 ++-
++ src/Generator_System.defs.hh      |    3 ++-
++ src/Grid_Generator_System.defs.hh |    3 ++-
++ 4 files changed, 8 insertions(+), 4 deletions(-)
++
++--- a/src/Grid_Generator_System.defs.hh
+++++ b/src/Grid_Generator_System.defs.hh
++@@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Variables_Set.types.hh"
++ #include "Grid.types.hh"
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -267,7 +268,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Grid_Generator,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Grid_Generator*,
++ 			   const Grid_Generator&>,
++       private Generator_System::const_iterator {
++--- a/src/Congruence_System.defs.hh
+++++ b/src/Congruence_System.defs.hh
++@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Grid.types.hh"
++ #include "Grid_Certificate.types.hh"
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -235,7 +236,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Congruence,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Congruence*,
++ 			   const Congruence&> {
++   public:
++--- a/src/Constraint_System.defs.hh
+++++ b/src/Constraint_System.defs.hh
++@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Congruence_System.types.hh"
++ #include <iterator>
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -204,7 +205,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Constraint,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Constraint*,
++ 			   const Constraint&> {
++   public:
++--- a/src/Generator_System.defs.hh
+++++ b/src/Generator_System.defs.hh
++@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
++ #include "Polyhedron.types.hh"
++ #include "Poly_Con_Relation.defs.hh"
++ #include <iosfwd>
+++#include <cstddef>
++ 
++ namespace Parma_Polyhedra_Library {
++ 
++@@ -250,7 +251,7 @@ public:
++   class const_iterator
++     : public std::iterator<std::forward_iterator_tag,
++ 			   Generator,
++-			   ptrdiff_t,
+++			   std::ptrdiff_t,
++ 			   const Generator*,
++ 			   const Generator&> {
++   public:

component/glib/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [glib]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.2.tar.xz
-md5sum = 26d1d08e478fc48c181ca8be44f5b69f
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/glib-2.40.0.tar.xz
+md5sum = 05fb7cb17eacbc718e90366a1eae60d9
 configure-options =
   --disable-static
   --disable-selinux
@@ -22,7 +22,7 @@ environment =
   PATH=${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-  LIBFFI_CFLAGS=-I${libffi:location}/lib/libffi-${libffi:version}/include
+  LIBFFI_CFLAGS=-I${libffi:location}/include
   LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
 
 [x86-cygwin-glib]

component/glibmm/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [glibmm]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.39/glibmm-2.39.3.tar.xz
-md5sum = 4cd63bdb100b4ddc4c69504d1cec62f7
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/glibmm-2.40.0.tar.xz
+md5sum = f62754f4f5c9030f8ff43c7ed20556c2
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig
 configure-options =
   --disable-documentation

component/gnutls/buildout.cfg

@@ -16,8 +16,8 @@ md5sum = fe0cfa7e15262ef8fdeee366109e9ff6
 
 [gcrypt]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.1.tar.bz2
-md5sum = a5a5060dc2f80bcac700ab0236ea47dc
+url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.2.tar.bz2
+md5sum = b54395a93cb1e57619943c082da09d5f
 configure-options =
   --with-gpg-error-prefix=${gpg-error:location}
 environment =

component/groonga/buildout.cfg

@@ -11,9 +11,13 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-version = 4.0.4
+version = 4.0.6
 url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
-md5sum = b00411d2efae3ddf03eb1ecb8575177f
+md5sum = d7eb0296b0b759d1856c31b6288670fa
+# temporary patch to respect more tokens in natural language mode.
+patches =
+  ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
+patch-options = -p1
 configure-options =
   --disable-static
   --disable-glibtest

component/groonga/groonga.patch

+diff --git a/lib/ii.c b/lib/ii.c
+index d10b84d..e20bdce 100644
+--- a/lib/ii.c
++++ b/lib/ii.c
+@@ -5695,7 +5695,9 @@ grn_ii_similar_search(grn_ctx *ctx, grn_ii *ii,
+     ? (optarg->similarity_threshold > GRN_HASH_SIZE(h)
+        ? GRN_HASH_SIZE(h)
+        : optarg->similarity_threshold)
+-    : (GRN_HASH_SIZE(h) >> 3) + 1;
++    : (GRN_HASH_SIZE(h) < 8
++       ? GRN_HASH_SIZE(h)
++       : ((GRN_HASH_SIZE(h) - 8) >> 3) + 8);
+   if (GRN_HASH_SIZE(h)) {
+     grn_id j, id;
+     int w2, rep;

component/gtk-2/buildout.cfg

@@ -50,8 +50,8 @@ environment =
 
 [harfbuzz]
 recipe = slapos.recipe.cmmi
-url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.28.tar.bz2
-md5sum = accbeb679f39d839038b95a87e40870e
+url = http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.35.tar.bz2
+md5sum = 531ee8650626ecddcd90b2a4637e31d4
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}
 configure-options =
   --disable-static
@@ -65,8 +65,8 @@ environment =
 
 [pango]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.1.tar.xz
-md5sum = 9e0d3a1ea395172f8c39ba98a4d2081a
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/pango-1.36.3.tar.xz
+md5sum = d9532826e95bdb374355deebc42441bb
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
   --disable-static
@@ -79,7 +79,7 @@ environment =
 
 [gdk-pixbuf]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.7.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/gdk-pixbuf-2.30.7.tar.xz
 md5sum = 1195d26f14adfe99ff0878d37678a70a
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}
 configure-options =
@@ -96,8 +96,8 @@ environment =
 
 [atk]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/atk/2.11/atk-2.11.5.tar.xz
-md5sum = 4981a8f1e4627c07b00905216889439b
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/atk-2.12.0.tar.xz
+md5sum = 930238dec55fdbf8eda9975b44f07b76
 environment =
   PATH=${glib:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
@@ -106,8 +106,8 @@ environment =
 
 [gtk-2]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.22.tar.xz
-md5sum = 5fbbfb7637bbd571a572a2dae0e736d2
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/gtk+-2.24.23.tar.xz
+md5sum = 0be39fbed4ca125645175cd6e22f2548
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/gtkmm/buildout.cfg

@@ -30,7 +30,7 @@ environment =
 
 [pangomm]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnome.org/pub/gnome/sources/pangomm/2.34/pangomm-2.34.0.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/pangomm-2.34.0.tar.xz
 md5sum = 2c702caede167323c9ed9eed2b933098
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${glibmm:location}/lib/pkgconfig:${glibmm:pkg_config_depends}:${cairomm:location}/lib/pkgconfig
 configure-options =
@@ -43,7 +43,7 @@ environment =
 
 [atkmm]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/atkmm/2.22/atkmm-2.22.7.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/atkmm-2.22.7.tar.xz
 md5sum = fec7db3fc47ba2e0c95d130ec865a236
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${atk:location}/lib/pkgconfig:${libsigc:location}/lib/pkgconfig:${glibmm:location}/lib/pkgconfig:
 configure-options =

component/hookbox/buildout.cfg

 [buildout]
 parts =
   hookbox
-find-links =
-  http://www.nexedi.org/static/packages/source/
+
 versions = versions
 
 [versions]

component/icu/buildout.cfg

@@ -9,3 +9,6 @@ url = http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz
 md5sum = ea93970a0275be6b42f56953cd332c17
 configure-command = source/configure
 configure-options = --prefix=${:location}
+
+[icu]
+<= icu4c

component/inkscape/buildout.cfg

@@ -34,12 +34,9 @@ environment =
 
 [inkscape]
 recipe = slapos.recipe.cmmi
-url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
-md5sum = 47bd8546e42ba396624eef9eb66b9b6c
+url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.5/inkscape-0.48.5.tar.bz2
+md5sum = 431cda5cd40cd4fdf2b89db1bdcce61f
 pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
-patch-options = -p0
-patches =
-  ${:_profile_base_location_}/inkscape-0.48.4.patch#1bdb1154e98c08cb676445b625d7cec0
 configure-options =
   --disable-lcms
   --without-gnome-vfs

component/inkscape/inkscape-0.48.4.patch

---- src/widgets/desktop-widget.h~       2011-07-08 20:25:09.000000000 +0200
-+++ src/widgets/desktop-widget.h        2014-01-17 13:22:48.503773743 +0100
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);

component/jemalloc/buildout.cfg

+[buildout]
+extends = ../readline/buildout.cfg
+parts =
+  jemalloc
+
+[jemalloc]
+recipe = slapos.recipe.cmmi
+url = http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2
+md5sum = e76665b63a8fddf4c9f26d2fa67afdf2
+configure-options =
+  --disable-static
+  --enable-readline
+environment =
+  CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include
+  LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib

component/kumo/buildout.cfg

@@ -6,7 +6,6 @@ extends =
   ../zlib/buildout.cfg
 
 parts = kumo
-find-links = http://www.nexedi.org/static/packages/source/
 
 [kumo]
 recipe = slapos.recipe.cmmi

component/libatlas/add-rpath.patch

+--- ATLAS/CONFIG/src/config.c.orig	2014-07-10 18:22:02.000000000 +0200
++++ ATLAS/CONFIG/src/config.c	2014-08-22 13:28:04.990976246 +0200
+@@ -455,10 +455,10 @@
+ 
+    if (OSIsWin(OS))
+       OSextra = "-lgcc";
+-   i = strlen(path) + strlen(libnam) + strlen(OSextra) + 2 + 2 + 1 + 1 + 1;
++   i = strlen(path) * 2 + strlen(libnam) + strlen(OSextra) + 2 + 11 + 2 + 1 + 1 + 1 + 1;
+    sp = malloc(i*sizeof(char));
+    assert(sp);
+-   sprintf(sp, "-L%s -l%s %s", path, libnam, OSextra);
++   sprintf(sp, "-L%s -Wl,-rpath=%s -l%s %s", path, path, libnam, OSextra);
+    return(sp);
+ }
+ 

component/libatlas/buildout.cfg

+[buildout]
+parts =
+  libatlas
+
+[lapack-download]
+recipe = hexagonit.recipe.download
+version = 3.5.0
+filename = lapack-${:version}.tgz
+url = http://www.netlib.org/lapack/${:filename}
+md5sum = b1d3e3e425b2e44a06760ff173104bdf
+download-only = true
+mode = 0644
+
+[libatlas]
+recipe = slapos.recipe.cmmi
+version = 3.10.2
+url = http://downloads.sourceforge.net/project/math-atlas/Stable/${:version}/atlas${:version}.tar.bz2
+md5sum = a4e21f343dec8f22e7415e339f09f6da
+# http://stackoverflow.com/questions/14592401/atlas-install-really-need-to-get-past-cpu-throttle-check
+# http://sourceforge.net/p/math-atlas/support-requests/886/
+patches =
+  ${:_profile_base_location_}/skip-throttle-check.patch#17c8471d67c99fac80ace05273ce0817
+  ${:_profile_base_location_}/add-rpath.patch#44672b68960a14b3fb4970cd1e76f8fe
+patch-options = -p1
+configure-command =
+  mkdir build
+  cd build
+  ../configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-netlib-lapack-tarfile=${lapack-download:location}/${lapack-download:filename}
+  --shared
+  -b "$(uname -p | grep -q 64 && echo 64 || echo 32)"
+  -Fa alg '-fPIC'
+make-options =
+  -C build
+environment =
+  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64

component/libatlas/skip-throttle-check.patch

+diff --git a/CONFIG/src/probe_arch.c b/CONFIG/src/probe_arch.c
+index 75edef9..f440bf6 100644
+--- a/CONFIG/src/probe_arch.c
++++ b/CONFIG/src/probe_arch.c
+@@ -238,8 +238,7 @@ int main(int nargs, char **args)
+       printf("CPU MHZ=%d\n",
+              ProbeOneInt(OS, asmd, targ, "-m", "CPU MHZ=", &sure));
+    if (flags & Pthrottle)
+-      printf("CPU THROTTLE=%d\n",
+-             ProbeOneInt(OS, asmd, targ, "-t", "CPU THROTTLE=", &sure));
++      printf("CPU THROTTLE=0\n");
+    if (flags & P64)
+    {
+       if (asmd == gas_x86_64)

component/libffi/buildout.cfg

@@ -4,10 +4,13 @@ parts =
 
 [libffi]
 recipe = slapos.recipe.cmmi
-version = 3.0.13
+version = 3.1
 url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
-md5sum = 45f3b6dbc9ee7c7dfbbbc5feba571529
+md5sum = f5898b29bbfd70502831a212d9249d10
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/includedir.diff#e430307d16a0d215a24ec2acff23d184
 configure-options =
   --disable-static
 # on x86_64 OpenSuse, libraries are installed under parts/libffi/lib64.

component/libffi/includedir.diff

+Index: b/libffi.pc.in
+===================================================================
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,10 +2,10 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${toolexeclibdir} -lffi
++Libs: -L${libdir} -lffi
+ Cflags: -I${includedir}
+Index: b/include/Makefile.am
+===================================================================
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+Index: b/include/Makefile.in
+===================================================================
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ DISTCLEANFILES = ffitarget.h
+ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+ all: all-am
+ 

component/libreoffice-bin/buildout.cfg

@@ -6,17 +6,14 @@ extends =
 parts =
   libreoffice-bin
 
-find-links =
-  http://www.nexedi.org/static/packages/source/
-
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 4.2.5.2
+version = 4.2.6.3
 url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 43b8a8e27fa655d487123c59e97083bc
-md5sum_x86-64 = 0da0e833b3ee2227c25db2c658bd96cc
+md5sum_x86 = 5a19002efc453a7af9443e1b01e7017a
+md5sum_x86-64 = 25d23958e8253182583e1af0ab9d1f5c
 
 # where office code can be found?
 officedir = libreoffice4.2

component/librsvg/buildout.cfg

@@ -12,7 +12,7 @@ extends =
 
 [libcroco]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/libcroco-0.6.8.tar.xz
 md5sum = 767e73c4174f75b99695d4530fd9bb80
 configure-options =
   --disable-static
@@ -23,7 +23,7 @@ environment =
 
 [librsvg]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/librsvg-2.40.2.tar.xz
 md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =

component/libsigc/buildout.cfg

@@ -9,7 +9,7 @@ parts =
 
 [libsigc]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.3/libsigc++-2.3.1.tar.xz
+url = http://ftp.gnome.org/pub/gnome/core/3.12/3.12.2/sources/libsigc++-2.3.1.tar.xz
 md5sum = 06a0569e8ba161d3428e7daa838682f8
 configure-options =
   --disable-documentation

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-4.0.tar.gz
-md5sum = d3d2d9bce3b6668b9827a9df52635be1
+url = ftp://ftp.gnu.org/gnu/libtasn1/libtasn1-4.1.tar.gz
+md5sum = f9b37df3c2c9c6439d8bf427bfbfc521
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/mariadb/buildout.cfg

@@ -5,6 +5,7 @@
 extends =
   ../cmake/buildout.cfg
   ../zlib/buildout.cfg
+  ../jemalloc/buildout.cfg
   ../groonga/buildout.cfg
   ../libaio/buildout.cfg
   ../libevent/buildout.cfg
@@ -19,9 +20,9 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.0.13
+version = 10.0.14
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 7b2e88864b51d7d0607dc37abb8a0adb
+md5sum = 80fea71de54a9cfa7f5508df53d3f06d
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -42,22 +43,22 @@ configure-options =
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
+  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_INSTALL_RPATH=${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   -DWITHOUT_TOKUDB=true
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${zlib:location}/lib
+  CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl: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:${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${zlib:location}/lib
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-4.04.tar.gz
-md5sum = a89987dad7b3e1d99014492e6135eec6
+url = http://packages.groonga.org/source/mroonga/mroonga-4.06.tar.gz
+md5sum = 042bc1fbc3f25593be4484529d598144
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/messagepack/buildout.cfg

 [buildout]
 parts = messagepack
-find-links = http://www.nexedi.org/static/packages/source/
 
 [messagepack]
 recipe = slapos.recipe.cmmi

component/nginx/buildout.cfg

 [buildout]
 extends =
-  ../pcre/buildout.cfg
-  ../zlib/buildout.cfg
-  ../openssl/buildout.cfg
   ../coreutils/buildout.cfg
   ../git/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts = nginx-output
 
-[nginx]
+[nginx-common]
 recipe = slapos.recipe.cmmi
-url = http://nginx.org/download/nginx-1.7.2.tar.gz
-md5sum = 68949a7a0bad4615e9b737fc4e6047f2
+url = http://nginx.org/download/nginx-1.7.5.tar.gz
+md5sum = e65aad627acc1cbe26527339a5814d57
+
+[nginx]
+<= nginx-common
 configure-options=
   --with-ipv6
   --with-http_ssl_module
   --with-mail
   --with-mail_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
 
-[webdav-module]
+[nginx-dav-ext-module]
 recipe = hexagonit.recipe.download
-url = https://github.com/arut/nginx-dav-ext-module/archive/master.zip
+url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz
 strip-top-level-dir = true
-#md5sum =
+md5sum = 2cb502dbda335be4ebd5fed0b3182bae
 mode = 0644
 
 [nginx-webdav]
-recipe = slapos.recipe.cmmi
-url = http://nginx.org/download/nginx-1.5.3.tar.gz
-md5sum = 1e735dd6a6ade2b5c20e924b67c3d355
+<= nginx-common
 configure-options =
   --with-ipv6
   --with-http_ssl_module
   --with-mail
   --with-mail_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L ${libexpat:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include -I ${libexpat:location}/include"
+  --with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${libexpat:location}/include -I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
   --with-http_dav_module 
-  --add-module='${webdav-module:location}'
+  --add-module='${nginx-dav-ext-module:location}'
 
 [nginx-output]
 # Shared binary location to ease migration
@@ -50,12 +52,6 @@ command = ${coreutils-output:test} -x ${:nginx} -a -f ${:mime}
 nginx = ${nginx:location}/sbin/nginx
 mime = ${nginx:location}/conf/mime.types
 
-
-[nginx-unstable]
-<= nginx
-url = http://nginx.org/download/nginx-1.3.15.tar.gz
-md5sum = ded252047393c79a31b0862e9166a065
-
 [hexaglobe-nginx-module]
 recipe = hexagonit.recipe.download
 url = http://easicloud-p.cdn.hexaglobe.net/nginx-easicloud.tar.gz

component/numpy/buildout.cfg

+[buildout]
+
+extends =
+  ../gcc/buildout.cfg
+  ../libatlas/buildout.cfg
+
+version = versions
+
+[numpy-env]
+PATH = ${gcc-fortran:location}/bin:%(PATH)s
+BLAS = ${libatlas:location}/lib/libcblas.a
+LAPACK = ${libatlas:location}/lib/liblapack.a
+ATLAS = ${libatlas:location}/lib/libatlas.a
+
+[numpy]
+recipe = zc.recipe.egg:custom
+egg = numpy
+# patched version that supports rpath parameter in zc.recipe.egg:custom.
+find-links = http://www.nexedi.org/static/packages/source/numpy-1.8.2nxd001.tar.gz
+environment = numpy-env
+# no need to add libatlas location because they are statically linked.
+rpath =
+  ${gcc-fortran:location}/lib
+  ${gcc-fortran:location}/lib64
+
+[versions]
+# patched version that supports rpath parameter in zc.recipe.egg:custom.
+numpy = 1.8.2nxd001

component/openoffice-bin/buildout.cfg

 [buildout]
 parts =
   openoffice-bin
-find-links =
-  http://www.nexedi.org/static/packages/source/
 
 [openoffice-bin]
 # XXX: This section and recipe have to be reviewed against using

component/p11-kit/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 
 [p11-kit]
 recipe = slapos.recipe.cmmi
-url = http://p11-glue.freedesktop.org/releases/p11-kit-0.20.2.tar.gz
-md5sum = 757b97ee4ac0ce598661a90cd784c4f1
+url = http://p11-glue.freedesktop.org/releases/p11-kit-0.21.1.tar.gz
+md5sum = 4eea22e3b58643de141990deaae6646b
 configure-options =
   --disable-static
   --disable-doc-html

component/pillow/buildout.cfg

 [buildout]
 extends =
   ../freetype/buildout.cfg
+  ../jbigkit/buildout.cfg
+  ../lcms/buildout.cfg
   ../libjpeg/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../webp/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -12,13 +16,25 @@ recipe = zc.recipe.egg:custom
 egg = Pillow
 include-dirs =
   ${freetype:location}/include
+  ${jbigkit:location}/include
+  ${lcms2:location}/include
   ${libjpeg:location}/include
+  ${libtiff:location}/include
+  ${webp:location}/include
   ${zlib:location}/include
 library-dirs =
   ${freetype:location}/lib
+  ${jbigkit:location}/lib
+  ${lcms2:location}/lib
   ${libjpeg:location}/lib
+  ${libtiff:location}/lib
+  ${webp:location}/lib
   ${zlib:location}/lib
 rpath =
   ${freetype:location}/lib
+  ${jbigkit:location}/lib
+  ${lcms2:location}/lib
   ${libjpeg:location}/lib
+  ${libtiff:location}/lib
+  ${webp:location}/lib
   ${zlib:location}/lib

component/pkgconfig/buildout.cfg

@@ -14,19 +14,19 @@ extends =
 
 [pkgconfig]
 recipe = slapos.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz
-md5sum = 5392b4e3372879c5bf856173b418d6a2
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+md5sum = aa3c86e67551adc3ac865160e34a2a0d
 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 && make install && ./configure
+  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make && ./configure
 configure-options =
   --prefix=${:location}
   --with-installed-glib
   --with-installed-popt
 environment =
-  PATH=${:location}/bin:%(PATH)s
+  PATH=.:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
   CPPFLAGS=-I${glib:location}/include -I${popt:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib

component/python-cryptography/buildout.cfg

 [buildout]
 extends =
-  ../libffi/buildout.cfg
   ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
 
@@ -11,9 +10,17 @@ parts =
 recipe = zc.recipe.egg:custom
 egg = cryptography
 environment = python-cryptography-env
+setup-eggs = ${python-cryptography-prep:eggs}
 
 [python-cryptography-env]
 PATH = ${pkgconfig:location}/bin:%(PATH)s
-PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
-LD_LIBRARY_PATH = ${libffi:location}/lib:${openssl:location}/lib
-CPATH = ${libffi:location}/include:${openssl:location}/include
+PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig
+LD_LIBRARY_PATH = ${openssl:location}/lib
+CPATH = ${openssl:location}/include
+
+[python-cryptography-prep]
+recipe = zc.recipe.egg
+eggs =
+  ${python-cffi:egg}
+  pycparser
+  six

component/readline/buildout.cfg

@@ -7,6 +7,21 @@ parts =
 [readline5]
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
+patches =
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-001#9d4d41622aa9b230c57f68548ce87d8f
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-002#f03e512d14206e37f7d6a748b56b9476
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-003#252b42d8750f1a94b6bdf086612dceb2
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-004#a32333c2e603a3ed250514e91050e552
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-005#8106796c09b789523a3a78ab69c04b6d
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-006#512188e2bf0837f7eca19dbf71f182ae
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-007#ac17aca62eb6fb398c9f2fe9de540aff
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-008#2484c392db021905f112cf97a94dfd4c
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-009#fc6eb35d07914fae5c57d49c12483ff7
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-010#7a2bf3dc7ac7680b1461a5701100e91b
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-011#ef6cef6822663470f6ac8c517c5a7ec6
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-012#e3e9f441c8111589855bc363e5640f6c
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-013#3e2e5f543ed268a68fd1fa839faade1a
+  http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-014#a1be30e1c6f1099bb5fcef00a2631fb8
 md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
   --enable-multibyte
@@ -14,8 +29,17 @@ configure-options =
 
 [readline]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
-md5sum = 67948acb2ca081f23359d0256e9a271c
+url = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz
+md5sum = 33c8fb279e981274f485fd91da77e94a
+patches =
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001#4343f5ea9b0f42447f102fb61576b398
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002#700295212f7e2978577feaee584afddb
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003#af4963862f5156fbf9111c2c6fa86ed7
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004#11f9def89803a5052db3ba72394ce14f
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005#93721c31cd225393f80cb3aadb165544
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006#71dc6ecce66d1489b96595f55d142a52
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007#062a08ed60679d3c4878710b3d595b65
+  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008#ee1c04072154826870848d8b218d7b04
 configure-options =
   --enable-multibyte
   --disable-static

component/ruby/buildout.cfg

@@ -7,6 +7,10 @@ extends =
   ../readline/buildout.cfg
   ../ncurses/buildout.cfg
   ../libyaml/buildout.cfg
+  ../openssl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../readline/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts = ruby
 
@@ -15,13 +19,15 @@ recipe = slapos.recipe.cmmi
 url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
 md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
 configure-options =
-  --enable-shared --enable-rpath
+  --enable-shared --enable-rpath --disable-install-doc
+  --enable-pthread --enable-ipv6
+  --with-ext=bigdecimal,continuation,curses,date,digest,dl,etc,fcntl,iconv,io,json,nkf,openssl,pathname,psych,pty,racc,readline,ripper,sdbm,socket,stringio,strscan,syck,syslog,zlib
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw  -I${gdbm:location}/include -I${openssl:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib  -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib   -Wl,-rpath=${ncurses:location}/lib  -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PKG_CONFIG_PATH=${libyaml:location}/lib/
 
 [ruby-1.9]
 <= ruby-1.9.3
 
 [ruby]
-<= ruby-1.9

component/slapos/buildout.cfg

@@ -2,7 +2,6 @@
 [buildout]
 extends =
   ../../stack/slapos.cfg
-  ../../stack/shacache-client.cfg
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
   ../m4/buildout.cfg
@@ -79,7 +78,9 @@ rpath =
 [slapos]
 recipe = z3c.recipe.scripts
 eggs =
-  ${python-openssl:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
   slapos.libnetworkcache
   zc.buildout
   ${lxml-python:egg}
@@ -115,12 +116,5 @@ interpreter = py
 scripts = py
 
 [versions]
-# Use setuptools-1.x for python 2.4/2.5 support
-setuptools = 1.4.2
-
-# pyOpenSSL 0.14 uses cryptograpic which is
-# incompatible with slapos package generation.
-pyOpenSSL = 0.13.1
-
 collective.recipe.template = 1.11
 z3c.recipe.scripts = 1.0.1

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
-md5sum = 0544ef6d7afd8ca797935ccc2685a9ed
+url = http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+md5sum = f7e4a156b583abeba349629e2364224b
 configure-options =
   --disable-static
   --enable-readline

component/squid/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 
 [squid]
 recipe = hexagonit.recipe.cmmi
-url = http://www1.at.squid-cache.org/Versions/v3/3.4/squid-3.4.4.tar.gz
-md5sum = b36ab3696485a86b43d9194ac9b6b7fe
+url = http://www.squid-cache.org/Versions/v3/3.4/squid-3.4.7.tar.bz2
+md5sum = 9951034b10f7ee0f45a95cfae61c57c2
 configure-options =
   --disable-dependency-tracking
   --disable-translation

component/trafficserver/buildout.cfg

@@ -20,8 +20,8 @@ parts =
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = http://apache.claz.org/trafficserver/trafficserver-4.2.1.1.tar.bz2
-md5sum = 7d154544c4953973570b4713a78cb0cb
+url = http://apache.claz.org/trafficserver/trafficserver-4.2.2.tar.bz2
+md5sum = e2249555837f4f7196d3189716b2828a
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-openssl=${openssl:location}

component/w3-validator/buildout.cfg

@@ -15,9 +15,6 @@ extends =
 
 parts = w3-validator
 
-find-links =
-  http://www.nexedi.org/static/packages/source/
-
 versions = versions
 
 [versions]

schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "description": "A short human-friendly name for the sofware release",
+      "type": "string"
+    },
+    "description": {
+      "description": "A short description of the sofware release",
+      "type": "string"
+    },
+    "serialisation": {
+      "description": "How the parameters and results are serialised",
+      "required": true,
+      "enum": ["xml", "json-in-xml"],
+      "type": "string"
+    },
+    "software-type": {
+      "description": "Existing software types",
+      "required": true,
+      "patternProperties": {
+        ".*": {
+          "description": "Software type declaration",
+          "additionalProperties": false,
+          "properties": {
+            "description": {
+              "description": "A human-friendly description of the software type",
+              "type": "string"
+            },
+            "serialisation": {
+              "description": "How the parameters and results are serialised, if different from global setting",
+              "enum": ["xml", "json-in-xml"],
+              "type": "string"
+            },
+            "request": {
+              "required": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+              "type": "string"
+            },
+            "response": {
+              "required": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+              "type": "string"
+            },
+            "index": {
+              "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+              "type": "any"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "type": "object"
+}
+

setup.py

@@ -52,6 +52,7 @@ setup(name=name,
       packages=find_packages(),
       include_package_data=True,
       install_requires=[
+        'jsonschema',
         'hexagonit.recipe.download',
         'lxml', # for full blown python interpreter
         'netaddr', # to manipulate on IP addresses
@@ -69,6 +70,7 @@ setup(name=name,
       entry_points={
         'zc.buildout': [
           'addresiliency = slapos.recipe.addresiliency:Recipe',
+          'accords = slapos.recipe.accords:Recipe',
           'agent = slapos.recipe.agent:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
           'apacheperl = slapos.recipe.apacheperl:Recipe',
@@ -90,6 +92,7 @@ setup(name=name,
           'condor = slapos.recipe.condor:Recipe',
           'condor.submit = slapos.recipe.condor:AppSubmit',
           'configurationfile = slapos.recipe.configurationfile:Recipe',
+          'copyfilelist = slapos.recipe.copyfilelist:Recipe',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
@@ -214,5 +217,7 @@ setup(name=name,
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',
         ],
       },
+      test_suite='slapos.test',
+      test_requires=[ 'jsonschema' ],
     )
 

sla.schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "instance_guid": {
+      "description": "XXX",
+      "type": "string"
+    },
+    "computer_guid": {
+      "description": "XXX",
+      "type": "string"
+    }
+  }
+}
\ No newline at end of file

slapos/recipe/accords/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import shutil
+from slapos.recipe.librecipe import GenericSlapRecipe
+import shutil
+import subprocess
+import sys
+
+class Recipe(GenericSlapRecipe):
+  def _install(self):
+    path_list = []
+    accords_location = self.buildout['accordsdirectory']['accords']
+
+    parameter_dict = dict(
+        userid=self.options['userid'],
+        tenantname=self.options['tenantname'],
+        password=self.options['password'],
+        domain=self.options['domain'],
+        openstack_url=self.options['openstack_url'],
+        python_location=sys.executable,
+        accords_location=accords_location,
+        manifest_name=self.options['manifest-name'],
+        # XXX this is workaround
+        accords_lib_directory=self.options['accords_lib_directory'],
+        computer_id = self.computer_id,
+        computer_partition_id = self.computer_partition_id,
+        server_url = self.server_url,
+        software_release_url = self.software_release_url,
+        key_file = self.key_file,
+        cert_file = self.cert_file,
+        path = '%s:%s' % (self.options['accords_bin_directory'],
+            os.environ.get('PATH', '')),
+    )
+    # Generate os-config.xml
+    os_config_file = self.createFile(self.options['os-config'],
+        self.substituteTemplate(self.getTemplateFilename('os_config.xml.in'),
+        parameter_dict))
+    path_list.append(os_config_file)
+
+    # Put modified accords configuration file
+    accords_configuration_parameter_dict = dict(
+        listen_ip = self.options['listen-ip']
+    )
+    accords_configuration_file_location = self.createFile(
+        self.options['accords-configuration-file'],
+        self.substituteTemplate(self.getTemplateFilename('accords.ini.in'),
+        accords_configuration_parameter_dict))
+    path_list.append(accords_configuration_file_location)
+
+    # XXX is it dangerous?
+    security_path = os.path.join(accords_location, 'security')
+    if os.path.exists(security_path):
+      shutil.rmtree(security_path)
+
+    # Initiate configuration
+    subprocess.check_call('./accords-config',
+                          cwd=accords_location
+    )
+
+    # Generate manifest
+    manifest_origin_location = self.options['manifest-source']
+    manifest_location = self.options['manifest-destination']
+
+    shutil.copy(manifest_origin_location, manifest_location)
+    path_list.append(manifest_location)
+
+    # Generate wrapper
+    wrapper_location = self.createPythonScript(self.options['accords-wrapper'],
+        '%s.accords.runAccords' % __name__,
+        parameter_dict)
+    path_list.append(wrapper_location)
+
+    # Generate helper for debug
+    self.createExecutable(
+        self.options['testos-wrapper'],
+        self.substituteTemplate(self.getTemplateFilename('testos.in'),
+            parameter_dict)
+    )
+
+    return path_list

slapos/recipe/accords/accords.py

+#!%(python_location)s
+
+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+from slapos import slap
+import signal
+import subprocess
+from subprocess import Popen
+import sys
+import time
+
+def runAccords(accords_conf):
+  """Launch ACCORDS, parse manifest, broker manifest, send connection
+     informations to SlapOS Master. Destroy instance and stops ACCORDS at
+     SIGTERM."""
+  computer_id = accords_conf['computer_id']
+  computer_partition_id = accords_conf['computer_partition_id']
+  server_url = accords_conf['server_url']
+  software_release_url = accords_conf['software_release_url']
+  key_file = accords_conf['key_file']
+  cert_file = accords_conf['cert_file']
+  accords_lib_directory = accords_conf['accords_lib_directory']
+  accords_location = accords_conf['accords_location']
+  manifest_name = accords_conf['manifest_name']
+
+  environment = dict(
+     LD_LIBRARY_PATH=accords_lib_directory,
+     PATH=accords_conf['path'],
+     HOME=accords_location,
+  )
+
+  # Set handler to stop ACCORDS when end of world comes
+  # XXX use subprocess.check_call and add exception handlers
+  def sigtermHandler(signum, frame):
+    Popen(['./co-command', 'stop', '/service/*'],
+        cwd=accords_location, env=environment).communicate()
+    Popen(['./co-stop'],
+        cwd=accords_location, env=environment).communicate()
+    sys.exit(0)
+
+  signal.signal(signal.SIGTERM, sigtermHandler)
+
+  # Launch ACCORDS, parse & broke manifest to deploy instance
+  print 'Starting ACCORDS and friends...'
+  subprocess.check_call(['./co-start'],cwd=accords_location, env=environment)
+  print 'Parsing manifest...'
+  subprocess.check_call(['./co-parser', manifest_name],
+      cwd=accords_location, env=environment)
+  print 'Brokering manifest...'
+  subprocess.check_call(['./co-broker', manifest_name],
+      cwd=accords_location, env=environment)
+  print 'Done.'
+
+  # Parse answer
+  # XXX
+  connection_dict = dict(connection='hardcoded')
+
+  # Send information about published service to SlapOS Master
+  slap_connection = slap.slap()
+  slap_connection.initializeConnection(server_url, key_file, cert_file)
+  computer_partition = slap_connection.registerComputerPartition(computer_id,
+      computer_partition_id)
+  computer_partition.setConnectionDict(connection_dict)
+
+  # Go to sleep, wait kill
+  while(True):
+    time.sleep(60)

slapos/recipe/accords/template/accords.ini.in

+# REST host (default: 127.0.0.1)
+resthost=%(listen_ip)s
+
+# REST port (default: 8086)
+#restport=8086
+
+# Target (default: ./accords.xml)
+#target=accords.xml
+
+# Acitvate TLS (default: 0)
+#tls=0
+
+# Activate monitoring (default: 1)
+#monitor=1
+
+# Trace (default: 1)
+#trace=1
+
+# Threads (default:1)
+#threads=1
+
+# Be verbose (default: 1)
+#verbose=0
+
+# Debug (default: 1)
+#debug=1
+
+# Domain (default: occi)
+#domain=occi
+
+# Operator (default: accords)
+#operator=accords
+
+# Password (default: co-system)
+#password=co-system
\ No newline at end of file

slapos/recipe/accords/template/coips.xml.in

+<?xml version="1.0" encoding="UTF8"?>
+<manifest name="coips:model" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">
+
+<description>Infrastructure profile used by production tool</description>
+	
+<node name="coips:model">
+<infrastructure name="coips:model">
+<compute name="coips:model" cores="1" speed="1GHz" architecture="x686" memory="1GB"/>
+<storage name="coips:model" size="10GB" type="SATA"/>
+<network name="coips:model" vlan="true" label="database"/>
+</infrastructure>
+</node> 
+
+
+</manifest>
\ No newline at end of file

slapos/recipe/accords/template/os_config.xml.in

+<os_configs>
+  <os_config
+    id="e1f892e3-slap-slap-slap-9354b95d3b17"
+    name="slaposrecipe"
+    description="Configuration of Account used by slapos recipe"
+    user="%(userid)s"
+    password="%(password)s"
+    authenticate=""
+    agent="CompatibleOne/OpenStackClient/1.0a.0.01"
+    host="%(openstack_url)s"
+    version="v1.1"
+    namespace="%(domain)s"
+    base=""
+    tls="0"
+    current="0"
+  />
+</os_configs>
\ No newline at end of file

slapos/recipe/accords/template/testos.in

+#!/bin/sh
+
+export PATH=%(path)s
+
+export ENO_HOST=%(openstack_url)s
+export ENO_USER=%(userid)s
+export ENO_PASS=%(password)s
+export ENO_VERSION=v1.1
+export ENO_TENANT=%(tenantname)s
+
+testos --host $ENO_HOST --password $ENO_PASS --user $ENO_USER --version $ENO_VERSION --tenant $ENO_TENANT $1 $2 $3 $4 $5 $6 $7

slapos/recipe/copyfilelist.py

+##############################################################################
+#
+# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import os
+import logging
+import shutil
+
+class Recipe:
+  def __init__(self, buildout, name, options):
+    self.buildout = buildout
+    self.name = name
+    self.options = options
+    self.logger = logging.getLogger(self.name)
+
+  def install(self):
+    """
+    Copy files to selected directory.
+    """
+    path_list = []
+    target_directory = self.options['target-directory']
+    for original_file_location in self.options['file-list'].split():
+      path, name = os.path.split(original_file_location)
+      destination_file_location = os.path.join(target_directory, name)
+      if os.path.exists(destination_file_location):
+        os.remove(destination_file_location)
+      shutil.copy(original_file_location, destination_file_location)
+      self.logger.debug('Created copy %r -> %r' % (
+          original_file_location,
+          destination_file_location))
+      path_list.append(destination_file_location)
+
+    return path_list

slapos/recipe/dcron.py

@@ -26,11 +26,8 @@
 ##############################################################################
 import os
 
-if __name__ == '__main__': # Hack to easily run test below.
-  GenericBaseRecipe = object
-else:
-  from slapos.recipe.librecipe import GenericBaseRecipe
-  from zc.buildout import UserError
+from slapos.recipe.librecipe import GenericBaseRecipe
+from zc.buildout import UserError
 
 class Recipe(GenericBaseRecipe):
 
@@ -131,41 +128,3 @@ def systemd_to_cron(spec):
           raise ValueError
   return ' '.join(spec)
 
-def test(self):
-  def _(systemd, cron):
-    self.assertEqual(systemd_to_cron(systemd), cron)
-  _("Sat,Mon-Thu,Sun", "0 0 * * 0,1-4,6")
-  _("mon,sun *-* 2,1:23", "23 2,1 * * 0,1")
-  _("Wed, 17:48", "48 17 * * 3")
-  _("Wed-Sat,Tue 10-* 1:2", "2 1 * 10 2,3-6")
-  _("*-*-7 0:0:0", "0 0 7 * *")
-  _("10-15", "0 0 15 10 *")
-  _("monday *-12-* 17:00", "00 17 * 12 1")
-  _("12,14,13,12:20,10,30", "20,10,30 12,14,13,12 * * *") # TODO: sort
-  _("*-1/2-1,3 *:30", "30 * 1,3 1/2 *")
-  _("03-05 08:05", "05 08 05 03 *")
-  _("08:05:00", "05 08 * * *")
-  _("05:40", "40 05 * * *")
-  _("Sat,Sun 12-* 08:05", "05 08 * 12 0,6")
-  _("Sat,Sun 08:05", "05 08 * * 0,6")
-
-  def _(systemd):
-    self.assertRaises(Exception, systemd_to_cron, systemd)
-  _("test")
-  _("")
-  _("7")
-  _("121212:1:2")
-
-  _("Wed *-1")
-  _("08:05:40")
-  _("2003-03-05")
-
-  _("0-1"); _("13-1"); _("6/4-1"); _("5/8-1")
-  _("1-0"); _("1-32"); _("1-4/3"); _("1-14/18")
-  _("24:0");_("9/9:0"); _("8/16:0")
-  _("0:60"); _("0:22/22"); _("0:15/45")
-
-if __name__ == '__main__':
-  import unittest
-  unittest.TextTestRunner().run(type('', (unittest.TestCase,), {
-    'runTest': test})())

slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in

@@ -197,6 +197,7 @@ ListenIP=%(ip)s
 # Range: 1-30
 # Default:
 # Timeout=3
+Timeout=15
 
 ### Option: Include
 #	You may include individual files or all files in a directory in the configuration file.

slapos/test/metaschema.json

+{
+    "id": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "Core schema meta-schema",
+    "definitions": {
+        "schemaArray": {
+            "type": "array",
+            "minItems": 1,
+            "items": { "$ref": "#" }
+        },
+        "positiveInteger": {
+            "type": "integer",
+            "minimum": 0
+        },
+        "positiveIntegerDefault0": {
+            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+        },
+        "simpleTypes": {
+            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
+        },
+        "stringArray": {
+            "type": "array",
+            "items": { "type": "string" },
+            "minItems": 1,
+            "uniqueItems": true
+        }
+    },
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "format": "uri"
+        },
+        "$schema": {
+            "type": "string",
+            "format": "uri"
+        },
+        "title": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "default": {},
+        "multipleOf": {
+            "type": "number",
+            "minimum": 0,
+            "exclusiveMinimum": true
+        },
+        "maximum": {
+            "type": "number"
+        },
+        "exclusiveMaximum": {
+            "type": "boolean",
+            "default": false
+        },
+        "minimum": {
+            "type": "number"
+        },
+        "exclusiveMinimum": {
+            "type": "boolean",
+            "default": false
+        },
+        "maxLength": { "$ref": "#/definitions/positiveInteger" },
+        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "pattern": {
+            "type": "string",
+            "format": "regex"
+        },
+        "additionalItems": {
+            "anyOf": [
+                { "type": "boolean" },
+                { "$ref": "#" }
+            ],
+            "default": {}
+        },
+        "items": {
+            "anyOf": [
+                { "$ref": "#" },
+                { "$ref": "#/definitions/schemaArray" }
+            ],
+            "default": {}
+        },
+        "maxItems": { "$ref": "#/definitions/positiveInteger" },
+        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "uniqueItems": {
+            "type": "boolean",
+            "default": false
+        },
+        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
+        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "required": { "$ref": "#/definitions/stringArray" },
+        "additionalProperties": {
+            "anyOf": [
+                { "type": "boolean" },
+                { "$ref": "#" }
+            ],
+            "default": {}
+        },
+        "definitions": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "properties": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "patternProperties": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "dependencies": {
+            "type": "object",
+            "additionalProperties": {
+                "anyOf": [
+                    { "$ref": "#" },
+                    { "$ref": "#/definitions/stringArray" }
+                ]
+            }
+        },
+        "enum": {
+            "type": "array",
+            "minItems": 1,
+            "uniqueItems": true
+        },
+        "type": {
+            "anyOf": [
+                { "$ref": "#/definitions/simpleTypes" },
+                {
+                    "type": "array",
+                    "items": { "$ref": "#/definitions/simpleTypes" },
+                    "minItems": 1,
+                    "uniqueItems": true
+                }
+            ]
+        },
+        "allOf": { "$ref": "#/definitions/schemaArray" },
+        "anyOf": { "$ref": "#/definitions/schemaArray" },
+        "oneOf": { "$ref": "#/definitions/schemaArray" },
+        "not": { "$ref": "#" }
+    },
+    "dependencies": {
+        "exclusiveMaximum": [ "maximum" ],
+        "exclusiveMinimum": [ "minimum" ]
+    },
+    "default": {}
+}

slapos/test/recipe/test_dcron.py

+import unittest
+from slapos.recipe.dcron import systemd_to_cron
+
+class TestDcron(unittest.TestCase):
+  def test(self):
+    def _(systemd, cron):
+      self.assertEqual(systemd_to_cron(systemd), cron)
+    _("Sat,Mon-Thu,Sun", "0 0 * * 0,1-4,6")
+    _("mon,sun *-* 2,1:23", "23 2,1 * * 0,1")
+    _("Wed, 17:48", "48 17 * * 3")
+    _("Wed-Sat,Tue 10-* 1:2", "2 1 * 10 2,3-6")
+    _("*-*-7 0:0:0", "0 0 7 * *")
+    _("10-15", "0 0 15 10 *")
+    _("monday *-12-* 17:00", "00 17 * 12 1")
+    _("12,14,13,12:20,10,30", "20,10,30 12,14,13,12 * * *") # TODO: sort
+    _("*-1/2-1,3 *:30", "30 * 1,3 1/2 *")
+    _("03-05 08:05", "05 08 05 03 *")
+    _("08:05:00", "05 08 * * *")
+    _("05:40", "40 05 * * *")
+    _("Sat,Sun 12-* 08:05", "05 08 * 12 0,6")
+    _("Sat,Sun 08:05", "05 08 * * 0,6")
+
+    def _(systemd):
+      self.assertRaises(Exception, systemd_to_cron, systemd)
+    _("test")
+    _("")
+    _("7")
+    _("121212:1:2")
+
+    _("Wed *-1")
+    _("08:05:40")
+    _("2003-03-05")
+
+    _("0-1"); _("13-1"); _("6/4-1"); _("5/8-1")
+    _("1-0"); _("1-32"); _("1-4/3"); _("1-14/18")
+    _("24:0");_("9/9:0"); _("8/16:0")
+    _("0:60"); _("0:22/22"); _("0:15/45")

slapos/test/schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "description": "A short human-friendly name for the sofware release",
+      "type": "string"
+    },
+    "description": {
+      "description": "A short description of the sofware release",
+      "type": "string"
+    },
+    "serialisation": {
+      "description": "How the parameters and results are serialised",
+      "require": true,
+      "enum": ["xml", "json-in-xml"],
+      "type": "string"
+    },
+    "software-type": {
+      "description": "Existing software types",
+      "require": true,
+      "patternProperties": {
+        ".*": {
+          "description": "Software type declaration",
+          "additionalProperties": false,
+          "properties": {
+            "title": {
+              "description": "A human-friendly title of the software type",
+              "type": "string"
+            },
+            "description": {
+              "description": "A human-friendly description of the software type",
+              "type": "string"
+            },
+            "serialisation": {
+              "description": "How the parameters and results are serialised, if different from global setting",
+              "enum": ["xml", "json-in-xml"],
+              "type": "string"
+            },
+            "request": {
+              "require": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+              "type": "string"
+            },
+            "response": {
+              "require": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+              "type": "string"
+            },
+            "index": {
+              "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "type": "object"
+}
+

slapos/test/test_json_schema.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import unittest
+import os
+import glob
+import json
+import slapos.test
+import jsonschema
+
+
+def getSchemaValidator(filename):
+  schema_json_file = "/".join(slapos.test.__file__.split("/")[:-1])
+  schema_json_file += "/%s" % filename
+  with open(schema_json_file, "r") as json_file:
+    json_dict = json.loads(json_file.read())
+    json_file.close()
+  return json_dict
+
+def createTest(path, json_dict):
+  def run(self, *args, **kwargs):
+    with open(path, "r") as json_file:
+      self.assertEquals(jsonschema.validate(json.loads(json_file.read()), json_dict), None)
+      json_file.close()
+
+  return run
+
+def generateSoftwareCfgTest():
+  json_dict = getSchemaValidator("schema.json")
+  base_path = "/".join(slapos.test.__file__.split("/")[:-3])
+  for path in glob.glob("%s/software/*/software.cfg.json" % base_path):
+    test_name = "test_%s_software_cfg_json" % path.split("/")[-2]
+    setattr(TestJSONSchemaValidation, test_name , createTest(path, json_dict)) 
+
+
+def generateJSONSchemaTest():
+  json_dict = getSchemaValidator("metaschema.json")
+  base_path = "/".join(slapos.test.__file__.split("/")[:-3])
+  for path in glob.glob("%s/software/*/*schema.json" % base_path):
+    software_type = path.split("/")[-2]
+    filename = path.split("/")[-1].replace("-", "_").replace(".", "_")
+    test_name = "test_schema_%s_%s" % (software_type, filename)
+    setattr(TestJSONSchemaValidation, test_name , createTest(path, json_dict)) 
+
+class TestJSONSchemaValidation(unittest.TestCase):
+  pass
+
+generateSoftwareCfgTest()
+generateJSONSchemaTest()
+
+if __name__ == '__main__':
+  unittest.main()

slapos/test/test_recipe.py

+import os
+import sys
+import unittest
+
+def additional_tests():
+  """
+  Load all recipe tests. test file must be called or finished by "test_recipe.py".
+  """
+  setup_file = sys.modules['__main__'].__file__
+  setup_directory = os.path.abspath(os.path.dirname(setup_file))
+  recipe_directory = os.path.join(setup_directory, 'slapos', 'test', 'recipe')
+  return unittest.defaultTestLoader.discover(recipe_directory)
+

software/agent/software.cfg

@@ -60,63 +60,3 @@ eggs =
   slapos.core
   slapos.toolbox[agent]
   erp5.util
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Cedric de Saint Martin
-#   Rafael Monnerat
-#   Test agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAOcKrOH/2Da6MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjk3MCAXDTEyMDYyNjAzMDU1MVoYDzIxMTIwNjAyMDMwNTUxWjAT
-  MREwDwYDVQQDDAhDT01QLTI5NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  xzbOGlcoin2q+Mtp52r26Njliz2aoxIXbnOBUyDc/OGtk9nWA5uBtTc2zwR17um6
-  KV0bGyvuBA78XcvU+AIV/5s0ohBAX7yjRKmEhAYcFvov3EyWSdjOrqqo4qFSzOrK
-  sVQBlxIDpjQBH4F3lf6dBv6/M+tCT3iSv3aOZbsG0E8CAwEAAaNQME4wHQYDVR0O
-  BBYEFLqtrfTu+BIVt+TFiRUkIoiWIYrxMB8GA1UdIwQYMBaAFLqtrfTu+BIVt+TF
-  iRUkIoiWIYrxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc8N5P5gW
-  Jrdk9gF/3Cpp6THDiy93+WcuAm7zFwXPFNttJtFKMNObP2YRZvsQkvjezfrZoRBF
-  j8LgKB3tZCbBj+HDj+AeD+q9V+cqMFLKc6LezvQYUuum6bZdfUNnPv1K1ULYSPjq
-  /jsRBbabCWSXqxR6gYEM6ooauj3udBMXhHE=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----

software/ajaxplorer/software.cfg

@@ -80,172 +80,13 @@ filename = apache.conf.in
 md5sum = 6788381fadd8ca96f892d33df3163da0
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
 [versions]
-#Error: Couldn't install: lxml 3.1.2
-lxml = 3.1.1
 # Numpy 1.7.0 doesn't install well
 numpy = 1.6.2
 # websockify 0.4.1 doesn't install well
 websockify = 0.3.0
-slapos.cookbook=0.78.1
-
-Jinja2 = 2.7
-MarkupSafe = 0.18
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-inotifyx = 0.2.0-1
-meld3 = 0.6.10
-netaddr = 0.7.10
 plone.recipe.command = 1.1
-pytz = 2013b
-slapos.core = 0.35.1
 slapos.recipe.build = 0.11.6
-slapos.recipe.cmmi = 0.1.1
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-xml-marshaller = 0.9.7
 z3c.recipe.mkdir = 0.5
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.78.1
-lock-file = 2.0
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.2
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
\ No newline at end of file

software/apache-frontend/TODO.txt

 Apache:
 =======
-- set a redirection of / in option
-- Implement support of multiple ip (if possible) for multiple ssl (other solution is to ask master instance but quid to much apache process?)
 
-Squid:
-======
-- Only cache in ram. Problems with to much squid on the computer or too many slave?
-
-SlapOS:
-=======
-- Implement intelligent apache graceful -> Should check slave configuration and return error to slave if there is a problem (important but difficult)
-- useless srv/squid_cache directory so far

software/apache-frontend/common.cfg

@@ -67,14 +67,14 @@ mode = 0644
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = 53de57ef78345cedd3c715a105539ca3
+md5sum = cd5a385c44d56b4d13392eba4e938969
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 
 [template-apache-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
-md5sum = da22cc3b2095766c5e14b29afab2b760
+md5sum = 140b3be4ce46aa18b33aea5d379d90e9
 mode = 0644
 
 [template-slave-list]
@@ -135,7 +135,7 @@ mode = 640
 [template-default-slave-virtualhost]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/default-virtualhost.conf.in
-md5sum = 2241f952bc1072af77e87a6d5bb8b4f9
+md5sum = 9bd3eda3c2aad5061f6cd6985e6f18d0
 mode = 640
 
 [template-log-access]
@@ -165,3 +165,12 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = records.config.jinja2
 download-only = true
 mode = 0644
+
+[template-trafficserver-storage-config]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/templates/trafficserver/${:filename}
+md5sum = 23c83efaf2fb0f9f0b3096bbfdda05c1
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = storage.config.jinja2
+download-only = true
+mode = 0644

software/apache-frontend/instance-apache-frontend.cfg

@@ -464,10 +464,11 @@ wrapper-path = $${directory:service}/trafficserver
 reload-path = $${directory:etc-run}/trafficserver-reload
 local-ip = $${instance-parameter:ipv4-random}
 input-port = 23432
-hostname = $${slap-parameter:frontend-name}
+hostname = $${instance-parameter:configuration.frontend-name}
 remap = map / http://$${instance-parameter:ipv4-random}:$${apache-configuration:cache-through-port}
-disk-cache-config = $${trafficserver-directory:cache-path} $${instance-parameter:configuration.disk-cache-size} volume=$${slap-parameter:frontend-name}
 plugin-config = ${trafficserver:location}/libexec/trafficserver/rfc5861.so
+cache-path = $${trafficserver-directory:cache-path}
+disk-cache-size = $${instance-parameter:configuration.disk-cache-size}
 
 [trafficserver-configuration-directory]
 recipe = plone.recipe.command
@@ -496,6 +497,14 @@ extra-context =
     section ats_directory trafficserver-directory
     section ats_configuration trafficserver-variable
 
+[trafficserver-storage-config]
+< = jinja2-template-base
+template = ${template-trafficserver-storage-config:location}/${template-trafficserver-storage-config:filename}
+rendered = $${trafficserver-directory:configuration}/storage.config
+mode = 700
+extra-context =
+    section trafficserver trafficserver-variable
+
 [trafficserver-remap-config]
 < = jinja2-template-base
 template = ${template-empty:target}
@@ -512,14 +521,6 @@ mode = 700
 context =
     key content trafficserver-variable:plugin-config
 
-[trafficserver-storage-config]
-< = jinja2-template-base
-template = ${template-empty:target}
-rendered = $${trafficserver-configuration-directory:target}/storage.config
-mode = 700
-context =
-    key content trafficserver-variable:disk-cache-config
-
 [trafficserver-promise-listen-port]
 recipe = slapos.cookbook:check_port_listening
 path = $${directory:promise}/trafficserver-port-listening

software/apache-frontend/instance-apache-replicate.cfg.in

@@ -99,6 +99,7 @@ state = {{ frontend_request.get('state') }}
 {%   set slave_configuration_dict = frontend_request.get('config') %}
 {%   do slave_configuration_dict.update(**slapparameter_dict) %}
 {%   do slave_configuration_dict.__setitem__(slave_list_name, json_module.dumps(authorized_slave_list)) %}
+{%   do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %}
 config-_ = {{ json_module.dumps(slave_configuration_dict) }}
 {%   if frontend_request.get('sla') %}
 sla = {{ ' '.join(frontend_request.get('sla').keys()) }}

software/apache-frontend/instance-slave-apache-input-schema.json

@@ -30,6 +30,13 @@
       "default": ""
     },
 
+    "default-path": {
+      "title": "Default Path",
+      "description": "Provide default path to redirect user to",
+      "type": "string",
+      "default": ""
+    },
+
     "ssl_crt": {
       "title": "SSL Certificate",
       "description": "SSL Certificate",

software/apache-frontend/software.cfg

@@ -7,147 +7,28 @@ apache-libcloud = 0.15.1
 async = 0.6.1
 cns.recipe.symlink = 0.2.3
 collective.recipe.template = 1.11
+ecdsa = 0.11
 gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
 slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
-slapos.toolbox = 0.39.3
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.40.2
 atomize = 0.2.0
 
 # Required by:
-# paramiko==1.14.0
-ecdsa = 0.11
-
-# Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
-# slapos.toolbox==0.39.3
-paramiko = 1.14.0
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

software/apache-frontend/templates/default-virtualhost.conf.in

@@ -35,11 +35,17 @@
   RewriteEngine On
 
 {% if slave_parameter.get('type', '') ==  'zope' -%}
+  {% if 'default-path' in slave_parameter %}
+  RewriteRule ^/?$ {{ slave_parameter.get('default-path') }} [R=301,L]
+  {% endif -%}
   # First, we check if we have a zope backend server
   # If so, let's use Virtual Host Daemon rewrite
   # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
   RewriteRule ^/(.*)$ {{ slave_parameter.get('url', '') }}/VirtualHostBase/https/{{ slave_parameter.get('custom_domain', '') }}:443/{{ slave_parameter.get('path', '') }}/VirtualHostRoot/$1 [L,P]
 {% else -%}
+  {% if 'default-path' in slave_parameter %}
+  RewriteRule ^/?$ {{ slave_parameter.get('default-path') }} [R=301,L]
+  {% endif -%}
   RewriteRule ^/(.*)$ {{ slave_parameter.get('url', '') }}/$1 [L,P]
 {% endif -%}
 </VirtualHost>
@@ -72,11 +78,17 @@
   RewriteCond     %{SERVER_PORT}  !^{{ https_port }}$
   RewriteRule     ^/(.*)          https://%{SERVER_NAME}/$1 [NC,R,L]
 {% elif slave_parameter.get('type', '') ==  'zope' -%}
+  {% if 'default-path' in slave_parameter %}
+  RewriteRule ^/?$ {{ slave_parameter.get('default-path') }} [R=301,L]
+  {% endif -%}
   # First, we check if we have a zope backend server
   # If so, let's use Virtual Host Daemon rewrite
   # We suppose that Apache listens to 80 (even indirectly thanks to things like iptables)
   RewriteRule ^/(.*)$ {{ slave_parameter.get('url', '') }}/VirtualHostBase/http/{{ slave_parameter.get('custom_domain', '') }}:80/{{ slave_parameter.get('path', '') }}/VirtualHostRoot/$1 [L,P]
 {% else -%}
+  {% if 'default-path' in slave_parameter %}
+  RewriteRule ^/?$ {{ slave_parameter.get('default-path') }} [R=301,L]
+  {% endif -%}
   RewriteRule ^/(.*)$ {{ slave_parameter.get('url', '') }}/$1 [L,P]
 {% endif -%}
   # If nothing exist : put a nice error

software/apache-frontend/templates/trafficserver/storage.config.jinja2

+{{ trafficserver.get("cache-path") }} {{ trafficserver.get("disk-cache-size") }} volume={{ trafficserver.get("hostname") }}
\ No newline at end of file

software/backupserver/software.cfg

@@ -40,136 +40,6 @@ interpreter = pythonforrssgen
 eggs =
   PyRSS2Gen
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----
-
 ##########################################################
 # Service startup scripts and configuration files
 ##########################################################
@@ -248,84 +118,8 @@ mode = 0644
 
 [versions]
 rdiff-backup = 1.0.5
-Jinja2 = 2.7
-MarkupSafe = 0.18
-Werkzeug = 0.9.1
-buildout-versions = 1.7
-gunicorn = 17.5
-itsdangerous = 0.22
-meld3 = 0.6.10
+gunicorn = 19.1.1
 plone.recipe.command = 1.1
-slapos.cookbook = 0.80
 slapos.recipe.build = 0.11.6
-slapos.recipe.cmmi = 0.1.1
 slapos.recipe.template = 2.4.2
-zc.recipe.egg = 1.3.2
 PyRSS2Gen = 1.1
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.10.1
-
-# Required by:
-# slapos.cookbook==0.78.1
-inotifyx = 0.2.0-1
-
-# Required by:
-# slapos.cookbook==0.78.1
-lock-file = 2.0
-
-# Required by:
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# xml-marshaller==0.9.7
-lxml = 3.2.1
-
-# Required by:
-# slapos.cookbook==0.78.1
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.3
-
-# Required by:
-# slapos.cookbook==0.78.1
-pytz = 2013b
-
-# Required by:
-# slapos.cookbook==0.78.1
-slapos.core = 0.35.1
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b2
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.78.1
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
-
-cliff = 1.4
-cmd2 = 0.6.5.1
-prettytable = 0.7.2
-requests = 1.2.3
-
-cffi = 0.8.1
-cryptography = 0.4
-pyOpenSSL = 0.14
-six = 1.5.2
-
-# Required by:
-# cffi==0.8.1
-pycparser = 2.10

software/boinc-client/software.cfg

@@ -26,164 +26,7 @@ md5sum = 4a50c02252792d11b99d88206bc49e12
 output = ${buildout:directory}/template-boinc.cfg
 mode = 0644
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
 [versions]
-Jinja2 = 2.7
-MarkupSafe = 0.18
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-inotifyx = 0.2.0-1
-lxml = 3.2.1
-meld3 = 0.6.10
-netaddr = 0.7.10
 plone.recipe.command = 1.1
-pytz = 2013b
-slapos.core = 0.35.1
-slapos.recipe.cmmi = 0.1.1
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-xml-marshaller = 0.9.7
-slapos.cookbook=0.78.1
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.78.1
-lock-file = 2.0
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.2
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5

software/bonjourgrid-client/software.cfg

@@ -80,6 +80,3 @@ recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
-[versions]
-lxml = 2.3.6
\ No newline at end of file

software/bonjourgrid/software.cfg

@@ -159,6 +159,3 @@ recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
-[versions]
-lxml = 2.3.6
\ No newline at end of file

software/cloudooo/software.cfg

 [buildout]
 extends =
-  ../../stack/slapos.cfg
   ../../stack/cloudooo.cfg
 
-versions = versions
-
-# Local development
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/cloudooo-repository
-
 parts +=
 # Local development
-  slapos.cookbook-repository
-  check-recipe
-# Create instance template
-  template
+  cloudooo-develop
+  slapos-cookbook-develop
   slapos-cookbook
 
-# XXX: Workaround of SlapOS limitation
-# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
-# development / fast switching environment for whole software
-unzip = true
-
-# Local development
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.git
-branch = master
-git-executable = ${git:location}/bin/git
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+# Create instance template
+  template
 
 [slap-parameters]
 recipe = slapos.cookbook:slapconfiguration
@@ -99,133 +74,3 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
 md5sum = 740a313b0d9d98800b099af8bf7cd0a7
 mode = 640
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----

software/davstorage/common.cfg

 [buildout]
-
-versions = versions
-
 extends =
-  ../../component/apache-php/buildout.cfg  
+  ../../stack/slapos.cfg
+  ../../component/apache-php/buildout.cfg
   ../../component/apache/buildout.cfg
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../stack/shacache-client.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/python-2.7/buildout.cfg
   ../../component/gzip/buildout.cfg
 
-find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-
-# Use only quite well working sites.
-allow-hosts +=
-  *.googlecode.com
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  alastairs-place.net
-  bitbucket.org
-  dist.repoze.org
-  effbot.org
-  github.com
-  launchpad.net
-  peak.telecommunity.com
-  sourceforge.net
-  www.dabeaz.com
-  www.owlfish.com
-
 parts =
   apache-php
   application
   template
   lxml-python
-  eggs
   instance-recipe-egg
 
-unzip= true
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-
 [instance-recipe]
 egg = slapos.cookbook
 module = davstorage
@@ -79,6 +47,3 @@ url = ${:_profile_base_location_}/instance-davstorage.cfg
 md5sum = 699ecf4678386667f58a3391bab7af0f
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644
-
-[lxml-python]
-python = python2.7

software/davstorage/development.cfg

@@ -33,62 +33,5 @@ command =
   grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-002
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.6
-hexagonit.recipe.download = 1.6nxd002
-meld3 = 0.6.10
 openssl = 1.0.1c
-# Required by:
-# slapos.core
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook
-PyXML = 0.8.4
-
 slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.cookbook==0.24
-# slapos.core==0.14
-# xml-marshaller==0.9.7
-lxml = 3.1.0
-
-# Required by:
-# slapos.cookbook==0.24
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.14
-netifaces = 0.10.4
-
-# Required by:
-# slapos.cookbook==0.24
-# slapos.core==0.14
-# zc.buildout==1.5.3-dev-SlapOS-009
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.73.1
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.cookbook==0.73.1
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.24
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
-

software/davstorage/software.cfg

@@ -33,62 +33,5 @@ command =
   grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-002
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.6
-hexagonit.recipe.download = 1.6nxd002
-meld3 = 0.6.10
 openssl = 1.0.1c
-# Required by:
-# slapos.core
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook
-PyXML = 0.8.4
-
 slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.cookbook==0.24
-# slapos.core==0.14
-# xml-marshaller==0.9.7
-lxml = 3.1.0
-
-# Required by:
-# slapos.cookbook==0.24
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.14
-netifaces = 0.10.4
-
-# Required by:
-# slapos.cookbook==0.24
-# slapos.core==0.14
-# zc.buildout==1.5.3-dev-SlapOS-009
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
-# Required by:
-# slapos.cookbook==0.73.1
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.cookbook==0.73.1
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.24
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
-

software/dream/instance.cfg

+[buildout]
+parts =
+  dream_simulation
+  dream_platform
+  publish-connection-parameter
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[instance-parameter]
+recipe = slapos.cookbook:slapconfiguration
+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}
+
+port = 5000
+host = $${slap-network-information:local-ipv4}
+
+[dream_platform]
+recipe = slapos.cookbook:wrapper
+command-line = ${buildout:bin-directory}/dream_platform --host $${instance-parameter:host} --port $${instance-parameter:port}
+wrapper-path = $${directory:service}/dream_platform
+parameters-extra = true
+
+[dream_simulation]
+recipe = slapos.cookbook:wrapper
+command-line = ${buildout:bin-directory}/dream_simulation
+wrapper-path = $${directory:script}/dream_simulation
+parameters-extra = true
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = $${buildout:directory}
+etc = $${:home}/etc
+var = $${:home}/var
+script = $${:etc}/run/
+service = $${:etc}/service
+promise = $${:etc}/promise/
+log = $${:var}/log
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publishurl
+url = http://$${instance-parameter:host}:$${instance-parameter:port}
+
+; FIXME: how to enable this without "switch" swoftare type ?
+[slap-network-information]
+local-ipv4 = 0.0.0.0

software/dream/software.cfg

+[buildout]
+extends = 
+  ../../stack/slapos.cfg
+  ../../component/numpy/buildout.cfg
+  ../../component/r-language/buildout.cfg
+
+parts +=
+  rpy2
+  slapos-cookbook
+  dream-build
+  dream
+  instance
+
+[rpy2_env]
+PATH = ${r-language:location}/bin/:%(PATH)s
+
+[rpy2]
+recipe = zc.recipe.egg:custom
+environment = rpy2_env
+egg = rpy2>=2.3,<2.4
+
+[dream-repository.git]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/dream.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[dream-build]
+; use a develop egg to easily develop and because dream already exist on pypi
+; https://pypi.python.org/pypi/dream
+recipe = zc.recipe.egg:develop
+dependency = ${scipy-build:recipe}
+setup = ${dream-repository.git:location}
+
+[dream]
+recipe = zc.recipe.egg:scripts
+eggs = dream
+initialization =
+  # rpy2 needs R in $PATH
+  import os
+  os.environ['PATH'] = '${r-language:location}/bin' + os.pathsep + os.environ['PATH']
+
+[instance]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/instance.cfg
+

software/erp5/software.cfg

 [buildout]
 extends =
   ../../stack/erp5/buildout.cfg
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----

software/erp5testnode/instance-default.cfg

@@ -160,4 +160,4 @@ ca-dir = $${rootdirectory:srv}/ca
 node-quantity = 1
 test-suite-master-url =
 instance-dict =
-software-path-list = ["http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/erp5testnode:/software/seleniumrunner/software.cfg"]
+software-path-list = ["http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/master:/software/seleniumrunner/software.cfg"]

software/erp5testnode/software.cfg

 [buildout]
-
-find-links += http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-
 extends =
   ../../stack/slapos.cfg
   ../../component/git/buildout.cfg
@@ -74,109 +70,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = 7beecdffede3c0abf83944b57476f84f 
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Antoine Catton
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8DCCAVmgAwIBAgIJAJ5iKK7w6AQVMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-  BAMMBkNPTVAtMTAeFw0xMTExMjkxNjU1NDZaFw0xMjExMjgxNjU1NDZaMBExDzAN
-  BgNVBAMMBkNPTVAtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6IBOEnQP
-  qT1KPBT8xQnYe6ECxXkfV9zhuVwolB/2wHM1Qk0TRoOPRRHfOvzkLQUVkD9on6Dj
-  mJsYhrukqaidv0Y9n7c5JKM8DfFh41UP3wG6rJpPJ9VZ0ZzFjk+yzCSYrI6rf3Yd
-  vRhNbKHfBO+23DJJqeEiobxsOQc6eE9Gt78CAwEAAaNQME4wHQYDVR0OBBYEFDLf
-  TAc8fEZjGWNA62Tld7iSrgKgMB8GA1UdIwQYMBaAFDLfTAc8fEZjGWNA62Tld7iS
-  rgKgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA28CQAN/jC3X+5lOh
-  wYO0+HvXSa6TNy6k+xAXQHEezOSgA7QMjXGVPHNzZRxhI4k6mdGImmPlKfV/GgcA
-  T3XATu8g033m2pCtNXW6Awp4V2Mft+w5Hx4Y3iT0Uccxc/699PU/MGroBKVCphwB
-  /SvdKJ6l9YsKUKhJlMRQxc9QHdU=
-  -----END CERTIFICATE-----
+md5sum = b4556610d17ae769d759c49b0955b63e 
 
 [versions]
 PyXML = 0.8.5

software/html5as/software.cfg

@@ -67,140 +67,30 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
 apache-libcloud = 0.12.3
 async = 0.6.1
-buildout-versions = 1.7
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 2.0
-meld3 = 0.6.10
 pycrypto = 2.6
 rdiff-backup = 1.0.5
 slapos.recipe.build = 0.11.6
-slapos.recipe.cmmi = 0.1.1
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.34.0
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
-cliff = 1.4.4
-cmd2 = 0.6.5.1
-prettytable = 0.7.2
-requests = 1.2.3
-slapos.cookbook = 0.82
-cffi = 0.8.2
-cryptography = 0.4
 plone.recipe.command = 1.1
-pyOpenSSL = 0.14
-six = 1.7.3
 
 # Required by:
-# cffi==0.8.2
-pycparser = 2.10
-# Required by:
-# slapos.cookbook==0.82
-lock-file = 2.0
-
-# Required by:
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-Flask = 0.9
-
-# Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
-# slapos.cookbook==0.82
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.82
-# slapos.core==0.35.1
-# xml-marshaller==0.9.7
-lxml = 3.1.2
-
-# Required by:
-# slapos.cookbook==0.82
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.toolbox==0.34.0
-paramiko = 1.10.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-psutil = 0.7.0
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7
-
-# Required by:
-# slapos.cookbook==0.82
-pytz = 2013b
-
-# Required by:
-# slapos.cookbook==0.82
-# slapos.toolbox==0.34.0
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.82
-# slapos.toolbox==0.34.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
-[networkcache]
-# signature certificates of the following uploaders.
-# Łukasz Nowak
-# Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJANLesB1hoQIEMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDgyODE0MjEyOFoYDzIxMTIwODA0MTQyMTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  9ED8i6211znu1Z0milwuNZCLlmQlFP590neGjvSRla7wzIBwWreNAX2Hl05sd1og
-  PFZBSeWsStFHQRqjNYOx1WoS4olRGIAwiwLh3Hgmkc8oOe7/q3W22xOZTUXOIiq1
-  FV96jUHe9RmZ910VqLPCMK44aCTmabSCWwk4OfRzI3kCAwEAAaNQME4wHQYDVR0O
-  BBYEFBgvpmTAS/O9vfvSLnwKy/eJC/NAMB8GA1UdIwQYMBaAFBgvpmTAS/O9vfvS
-  LnwKy/eJC/NAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAM3qIP3sY
-  DtqzUJJ7WEbD0dcniHGEycOk/3EKB663jULar+KOuTIFmMGOy5MVWcDsCqjODWXK
-  9LnVeCSkC4Ct8kvkT/WdRFF/nqprbZ6bUrhx2yAKTH6CMhIjDJ8F7fAkH48fLD7M
-  HPuwnRO7OewFpzT/gfQgFKpmVBNUYq7YddE=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

software/html5ide/software.cfg

@@ -44,54 +44,8 @@ mode = 0644
 md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 
 [versions]
-Jinja2 = 2.7.3
-MarkupSafe = 0.23
 PyRSS2Gen = 1.1
-Werkzeug = 0.9.6
-buildout-versions = 1.7
-cffi = 0.8.6
-cliff = 1.6.1
-cmd2 = 0.6.7
 cns.recipe.symlink = 0.2.3
 collective.recipe.template = 1.11
-cryptography = 0.5.1
-inotifyx = 0.2.0-1
-itsdangerous = 0.24
-lxml = 3.3.5
-meld3 = 1.0.0
-mr.developer = 1.30
-netaddr = 0.7.12
-netifaces = 0.10.4
 plone.recipe.command = 1.1
-pyOpenSSL = 0.14
-pyparsing = 2.0.2
-pytz = 2014.4
-requests = 2.3.0
-six = 1.7.3
-slapos.cookbook = 0.87
-slapos.core = 1.1.2
-slapos.recipe.cmmi = 0.2
 slapos.recipe.template = 2.5
-stevedore = 0.15
-supervisor = 3.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==1.1.2
-Flask = 0.10.1
-
-# Required by:
-# slapos.cookbook==0.87
-lock-file = 2.0
-
-# Required by:
-# slapos.core==1.1.2
-psutil = 2.1.1
-
-# Required by:
-# cffi==0.8.6
-pycparser = 2.10
-
-# Required by:
-# slapos.core==1.1.2
-zope.interface = 4.1.1
\ No newline at end of file

software/kumofs/software.cfg

@@ -18,8 +18,6 @@ parts =
   eggs
   instance-recipe-egg
 
-find-links += http://www.nexedi.org/static/packages/source/
-
 [instance-recipe]
 egg = slapos.cookbook
 module = kumofs
@@ -41,95 +39,6 @@ md5sum = 056a4af7128fd9e31da42c85cc039420
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[networkcache]
-# Cedric de Saint Martin signature certificate
-# Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
-  [versions]
-  Jinja2 = 2.6
-  Werkzeug = 0.8.3
-  buildout-versions = 1.7
-  meld3 = 0.6.10
-  rdiff-backup = 1.0.5
-  slapos.cookbook = 0.71.1
-  slapos.recipe.template = 2.4.2
-  
-  # Required by:
-  # slapos.core==0.33.1
-  Flask = 0.9
-  
-  # Required by:
-  # hexagonit.recipe.cmmi==1.6
-  hexagonit.recipe.download = 1.6nxd002
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  inotifyx = 0.2.0
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  # slapos.core==0.33.1
-  # xml-marshaller==0.9.7
-  lxml = 3.1beta1
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  netaddr = 0.7.10
-  
-  # Required by:
-  # slapos.core==0.33.1
-  netifaces = 0.10.4
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  pytz = 2012j
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  # slapos.core==0.33.1
-  # zc.buildout==1.6.0-dev-SlapOS-010
-  # zc.recipe.egg==1.3.2
-  setuptools = 0.6c12dev-r88846
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  slapos.core = 0.33.1
-  
-  # Required by:
-  # slapos.core==0.33.1
-  supervisor = 3.0b1
-  
-  # Required by:
-  # slapos.cookbook==0.71.1
-  xml-marshaller = 0.9.7
-  
-  # Required by:
-  # slapos.core==0.33.1
-  zope.interface = 4.0.3
+[versions]
+rdiff-backup = 1.0.5
+slapos.recipe.template = 2.4.2

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

@@ -71,12 +71,12 @@
       "title": "Existing disk image URL",
       "description": "If specified, will download an existing disk image (qcow2, raw, ...), and will use it as main virtual hard drive. Can be used to download and use an already installed and customized virtual hard drive.",
       "format": "uri",
-      "type": "string",
+      "type": "string"
     },
     "virtual-hard-drive-md5sum": {
       "title": "Checksum of virtual hard drive",
       "description": "MD5 checksum of virtual hard drive, used if virtual-hard-drive-url is specified.",
-      "type": "string",
+      "type": "string"
     },
 
     "use-tap": {
@@ -88,10 +88,8 @@
     "nat-rules": {
       "title": "List of rules for NAT of QEMU user mode network stack.",
       "description": "List of rules for NAT of QEMU user mode network stack, as comma-separated list of ports. For each port specified, it will redirect port x of the VM (example: 80) to the port x + 10000 of the public IPv6 (example: 10080). Defaults to \"22 80 443\". Ignored if \"use-tap\" parameter is enabled.",
-      "type": "string",
+      "type": "string"
     },
-
-
     "frontend-instance-guid": {
       "title": "Frontend Instance ID",
       "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",

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

@@ -4,15 +4,17 @@
     "backend-url": {
       "title": "Backend URL",
       "description": "URL used to connect directly to backend without frontend. Requires IPv6.",
-      "type": "uri",
-      "required": true
+      "type": "string",
+      "format": "uri",
+      "require": true
     },
 
     "url": {
       "title": "URL",
       "description": "URL used to connect to the service.",
-      "type": "uri",
-      "required": false
+      "type": "string",
+      "format": "uri",
+      "require": false
     }
   }
 }

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

 {
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "items": {
-      "allOf": [
-          {
-              "$ref": "instance-kvm-input-schema.json"
-          }
-      ],
-  "title": "Input Parameters",
-  "properties": {
-    "-sla-0-computer_guid": {
-      "title": "Target computer for main instance",
-      "description": "Target computer GUID for main instance.",
-      "type": "string"
-    },
-    "-sla-1-computer_guid": {
-      "title": "Target computer for first clone",
-      "description": "Target computer for first clone and PBS.",
-      "type": "string"
-    },
-    "-sla-2-computer_guid": {
-      "title": "Target computer for second clone",
-      "description": "Target computer for second clone and PBS.",
-      "type": "string"
-    },
-    "resiliency-backup-periodicity": {
-      "title": "Periodicity of backup",
-      "description": "Periodicity of backup, in cron format.",
-      "type": "string"
-    },
-    "remove-backup-older-than": {
-      "title": "Remove backups older than...",
-      "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
-      "type": "string",
-      "default": "3B"
+    "type": "object",
+    "$schema": "http://json-schema.org/draft-04/schema",
+    "items": {
+        "allOf": [
+            {
+                "$ref": "instance-kvm-input-schema.json"
+            }
+        ],
+        "title": "Input Parameters",
+        "properties": {
+            "-sla-0-computer_guid": {
+                "title": "Target computer for main instance",
+                "description": "Target computer GUID for main instance.",
+                "type": "string"
+            },
+            "-sla-1-computer_guid": {
+                "title": "Target computer for first clone",
+                "description": "Target computer for first clone and PBS.",
+                "type": "string"
+            },
+            "-sla-2-computer_guid": {
+                "title": "Target computer for second clone",
+                "description": "Target computer for second clone and PBS.",
+                "type": "string"
+            },
+            "resiliency-backup-periodicity": {
+                "title": "Periodicity of backup",
+                "description": "Periodicity of backup, in cron format.",
+                "type": "string"
+            },
+            "remove-backup-older-than": {
+                "title": "Remove backups older than...",
+                "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
+                "type": "string",
+                "default": "3B"
+            }
+        }
     }
-  }
 }

software/kvm/software.cfg

 [buildout]
 extends = common.cfg
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----
-
 [versions]
 PyRSS2Gen = 1.1
 apache-libcloud = 0.15.1
 async = 0.6.1
 collective.recipe.template = 1.11
-erp5.util = 0.4.38
+ecdsa = 0.11
+erp5.util = 0.4.41
 gitdb = 0.5.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
 slapos.recipe.download = 1.0.dev-r4053
-slapos.toolbox = 0.39.4
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 websockify = 0.6.0
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.39.4
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.39.4
+# slapos.toolbox==0.40.2
 atomize = 0.2.0
 
 # Required by:
-# paramiko==1.14.0
-ecdsa = 0.11
-
-# Required by:
-# slapos.toolbox==0.39.4
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
@@ -154,5 +35,5 @@ feedparser = 5.1.3
 numpy = 1.8.2
 
 # Required by:
-# slapos.toolbox==0.39.4
-paramiko = 1.14.0
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

software/mariadb/software.cfg

@@ -66,80 +66,6 @@ md5sum = a8df936b6abf82d0d798b83ddfebdc8a
 output = ${buildout:directory}/template-recover.cfg
 mode = 0644
 
-[networkcache]
-# Test agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
 [versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.6
-hexagonit.recipe.download = 1.6nxd002
-meld3 = 0.6.10
-slapos.cookbook = 0.72.0
 slapos.recipe.build = 0.11.5
 slapos.recipe.template = 2.4.2
-
-# Required by:
-# slapos.core==0.35
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.72.0
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.72.0
-# slapos.core==0.35
-# xml-marshaller==0.9.7
-lxml = 3.1.0
-
-# Required by:
-# slapos.cookbook==0.72.0
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35
-pyflakes = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.72.0
-pytz = 2012j
-
-# Required by:
-# slapos.cookbook==0.72.0
-slapos.core = 0.35
-
-# Required by:
-# slapos.core==0.35
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.72.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35
-zope.interface = 4.0.3

software/memcached/software.cfg

@@ -35,75 +35,5 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.7
-
-hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.6nxd002
 plone.recipe.command = 1.1
-
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-meld3 = 0.6.8
 slapos.recipe.template = 2.3
-
-# Required by:
-# slapos.core==0.2
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.7
-PyXML = 0.8.4
-
-# Required by:
-# slapos.cookbook==0.7
-# slapos.core==0.2
-# xml-marshaller==0.9.7
-lxml = 2.3.4
-
-# Required by:
-# slapos.core==0.2
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.2
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.7
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.2
-zope.interface = 3.8.0
-
-[networkcache]
-# Cedric de Saint Martin signature certificate
-# Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----

software/monitor/cgi-httpd.conf.in

+PidFile "{{ httpd_configuration.get('pid-file') }}"
+ServerName example.com
+ServerAdmin someone@email
+<IfDefine !MonitorPort>
+Listen [{{ httpd_configuration.get('listening-ip') }}]:{{ monitor_parameters.get('port') }}
+Define MonitorPort
+</IfDefine>
+DocumentRoot "{{ directory.get('www') }}"
+ErrorLog "{{ httpd_configuration.get('error-log') }}"
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule proxy_module      modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule env_module modules/mod_env.so
+LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
+
+SetEnvIf Origin "http(s)?://(www\.)?(.*)$" AccessControlAllowOrigin=$0
+Header always set Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
+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"
+
+
+
+# SSL Configuration
+<IfDefine !SSLConfigured>
+Define SSLConfigured
+SSLCertificateFile {{ httpd_configuration.get('certificate') }}
+SSLCertificateKeyFile {{ httpd_configuration.get('key') }}
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+SSLRandomSeed startup /dev/urandom 256
+SSLRandomSeed connect builtin
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLHonorCipherOrder On
+SSLCipherSuite RC4-SHA:HIGH:!ADH
+SSLSessionCache shmcb:/{{ directory.get("mod-ssl") }}/ssl_scache(512000)
+SSLSessionCacheTimeout  300
+</IfDefine>
+SSLEngine   On
+ScriptSock {{ httpd_configuration.get('cgid-pid-file') }}
+<Directory {{ directory.get('www') }}>
+  SSLVerifyDepth    1
+  SSLRequireSSL
+  SSLOptions        +StrictRequire
+  # XXX: security????
+  Options +ExecCGI
+  AddHandler cgi-script .cgi
+  DirectoryIndex {{ monitor_parameters.get('index-filename') }}
+</Directory>
+
+Alias /{{ monitor_private_hash }} {{ directory.get('private-directory') }}/
+<Directory {{ directory.get('private-directory') }}>
+    Order Allow,Deny
+    Allow from all
+    AllowOverride All
+    Satisfy Any
+    Options Indexes FollowSymLinks
+    DirectoryIndex index.html
+    <Files .htaccess>
+        order allow,deny
+        deny from all
+    </Files>
+</Directory>
+
+<Location /rewrite>
+AuthType Basic
+AuthName "Private access"
+AuthUserFile "{{ monitor_parameters.get('htaccess-file') }}"
+Require valid-user
+</Location>
+
+ProxyVia On
+RewriteEngine On
+{% for key, value in monitor_rewrite_rule.iteritems() %}
+RewriteRule ^/rewrite/{{ key }}($|/.*) {{ value }}/$1 [P,L]
+{% endfor %}

software/monitor/index.cgi.in

 #!{{ extra_eggs_interpreter }}
 
+# Beginning of response
+print "Content-Type: text/plain"
+print 
 print "OK"

software/monitor/instance.cfg

@@ -19,8 +19,6 @@ parts =
   monitor-promise
   monitor-instance-log-access
   cron-rsync-logs
-  plot-html
-  dygraph-js
   
 extends = ${monitor-template:output}
 
@@ -46,20 +44,6 @@ context =
   raw rsync_binary ${rsync:location}/bin/rsync
   key server_log_directory monitor-directory:server-log 
 
-[plot-html]
-recipe = slapos.recipe.template:jinja2
-template = ${template-plot-html:output}
-rendered = $${monitor-directory:server-log}/plot.html
-mode = 0644
-context =
-
-[dygraph-js]
-recipe = slapos.recipe.template:jinja2
-template = ${template-dygraph-js:output}
-rendered = $${monitor-directory:server-log}/dygraph-combined.js
-mode = 0644
-context =
-
 [pwgen]
 recipe = slapos.cookbook:generate.password
 user = admin
@@ -70,18 +54,38 @@ recipe = slapos.cookbook:generate.password
 user = admin
 bytes = 16
 
-[htpasswd-generate]
-recipe = plone.recipe.command
-output = $${monitor-parameters:htaccess-file}
-long_passwd = $${pwgen:passwd}$${pwgen32:passwd} 
-update-command = $${:command}
-command =
-  echo ${apache:location}/bin/htpasswd $${:output} $${pwgen:user} $${:long_passwd}
-  ${apache:location}/bin/htpasswd -cb $${:output} $${pwgen:user} $${:long_passwd}
 
 [monitor-directory]
 server-log = $${:private-directory}/server-log
+cache = $${:var}/cache
+mod-ssl = $${:cache}/httpd_mod_ssl
+
+[slap-parameter]
+private-hash = $${pwgen:passwd}$${pwgen32:passwd}
+frontend-domain = 
 
-[monitor-parameters]
-url = https://$${pwgen:user}:$${htpasswd-generate:long_passwd}@[$${slap-parameters:ipv6-random}]:$${:port}
+[monitor-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Monitor Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url domain
+config-url = $${monitor-parameters:url}
+config-domain = $${slap-parameter:frontend-domain}
+return = site_url domain
 
+[publish-connection-informations]
+recipe = slapos.cookbook:publish
+monitor_url = $${monitor-parameters:url}
+server_log_url = $${:url}$${slap-parameter:private-hash}/ 
+url = $${monitor-frontend:connection-site_url}
+
+[monitor-httpd-configuration-file]
+context =
+  section directory monitor-directory
+  section monitor_parameters monitor-parameters
+  section httpd_configuration monitor-httpd-configuration
+  section monitor_rewrite_rule monitor-rewrite-rule
+  key monitor_private_hash slap-parameter:private-hash  

software/monitor/plot.html.in

-<html>
-  <head>
-    <meta charset="utf-8">
-     <style>
-
-div {
-  float: left;
-  margin: 5px;
-}
-
-    </style>
-
-  </head>
-  <body>
-    
-    <div> <b> LOADAVG </b> <div class="chart"id="loadavg"> </div></div>
-    <div> <b> CPU PERCENT </b> <div class="chart"id="cpu_percent"> </div></div>
-    <div> <b> MEMORY USED </b> <div class="chart"id="memory_used"> </div></div>
-    <div> <b> MEMORY FREE </b> <div class="chart"id="memory_free"> </div></div>
-    <div> <b> NET IN BYTES </b> <div class="chart"id="net_in_bytes"> </div></div>
-    <div> <b> NET IN ERROR </b> <div class="chart"id="net_in_errors"> </div></div>
-    <div> <b> NET IN DROPPED </b> <div class="chart"id="net_in_dropped"> </div></div>
-    <div> <b> NET OUT BYTES </b> <div class="chart"id="net_out_bytes"> </div></div>
-    <div> <b> NET OUT ERRORS </b> <div class="chart"id="net_out_errors"> </div></div>
-    <div> <b> NET OUT DROPPED </b> <div class="chart"id="net_out_dropped"> </div></div>
-    
-    <script type="text/javascript" src="dygraph-combined.js"></script>
-    <script>
-    new Dygraph(
-        document.getElementById("loadavg"), "system_loadavg.csv");
-    
-    new Dygraph(
-        document.getElementById("cpu_percent"), "system_cpu_percent.csv");
-    
-    new Dygraph(
-        document.getElementById("memory_used"), "system_memory_used.csv");
-    
-    new Dygraph(
-        document.getElementById("memory_free"), "system_memory_free.csv");
-    
-    new Dygraph(
-        document.getElementById("net_in_bytes"), "system_net_in_bytes.csv");
-    
-    new Dygraph(
-        document.getElementById("net_in_errors"), "system_net_in_errors.csv");
-    
-    new Dygraph(
-        document.getElementById("net_in_dropped"), "system_net_in_dropped.csv");
-    
-    new Dygraph(
-        document.getElementById("net_out_bytes"), "system_net_out_bytes.csv");
-    
-    new Dygraph(
-        document.getElementById("net_out_errors"), "system_net_out_errors.csv");
-    
-    new Dygraph(
-        document.getElementById("net_out_dropped"), "system_net_out_dropped.csv");
-    
-    </script>
-
-  </body>
-</html>

software/monitor/rsync-logs.sh.in

 #!${dash-output:dash}
 
 RSYNC_BIN={{ rsync_binary }}
-SLAPGRID_LOGS={{ buildout_directory }}/../var/data-logs/
+SLAPGRID_LOGS={{ buildout_directory }}/../var/data-log/
 SERVERLOGS={{ server_log_directory }}
 
-$RSYNC_BIN -a $SLAPGRID_LOGS $SERVERLOGS
+$RSYNC_BIN -a --delete $SLAPGRID_LOGS $SERVERLOGS

software/monitor/software.cfg

@@ -15,35 +15,25 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/instance.cfg
-md5sum = 68e146558156c0702344c83876b4daf8 
+md5sum = 6ad84a0061df0c00a9f41d8b302adc45
 mode = 0644
 
 # stupify index for now
 [index]
 url = ${:_profile_base_location_}/${:filename}
-md5sum = 99ad2a7a9dbdae35e3d9aef352c4f0d5 
+md5sum = 876f18b159fbd9325332d0f42e9172ac
+
+[monitor-httpd-template]
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 1f30b17f5ea11fd033984d17c38bcfd3
 
 [rsync-logs-script]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/rsync-logs.sh.in
-md5sum = e48c41cf1cebcaf33353e950edc94717 
+md5sum = 33900b1f30f9d1de19814d6d3bacb03b
 output = ${buildout:directory}/template-rsync-logs.sh.in
 mode = 0644
 
-[template-plot-html]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/plot.html.in
-md5sum = 7f9f201f6695ae56b26b742e571478f5 
-output = ${buildout:directory}/template-plot-html.in
-mode = 0644
-
-[template-dygraph-js]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/dygraph-combined.js
-md5sum = 9bbf0b64dc1ee1ed3b6f4e2c302e21aa
-output = ${buildout:directory}/dygraph-combined.js
-mode = 0644
-
 [eggs]
 recipe = z3c.recipe.scripts
 eggs = 

software/mysql-5.1/software.cfg

@@ -44,87 +44,5 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-# Use old cookbook version
-slapos.cookbook = 0.13
-
-Jinja2 = 2.6
-Werkzeug = 0.8.2
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.6nxd002
-meld3 = 0.6.8
 rdiff-backup = 1.0.5
 slapos.recipe.template = 2.2
-
-# Required by:
-# slapos.core==0.21
-Flask = 0.8
-
-# Required by:
-# slapos.cookbook==0.13
-PyXML = 0.8.4
-
-# Required by:
-# slapos.cookbook==0.13
-# slapos.core==0.21
-# xml-marshaller==0.9.7
-lxml = 2.3.3
-
-# Required by:
-# slapos.cookbook==0.13
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.21
-netifaces = 0.6
-
-# Required by:
-# slapos.cookbook==0.13
-slapos.core = 0.21
-
-# Required by:
-# slapos.core==0.21
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.13
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.13
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.21
-zope.interface = 3.8.0
-
-[networkcache]
-# Cedric de Saint Martin signature certificate
-# Test agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----

software/nginx-push-stream/software.cfg

@@ -41,183 +41,7 @@ md5sum = 478085d0abb0ffc0b259c038bddae205
 output = ${buildout:directory}/instance-nginx.cfg.in
 mode = 0644
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----
-
 [versions]
-Jinja2 = 2.7.3
-MarkupSafe = 0.23
-Werkzeug = 0.9.6
-buildout-versions = 1.7
-cffi = 0.8.6
-cliff = 1.6.1
-cmd2 = 0.6.7
-cryptography = 0.5.1
-inotifyx = 0.2.0-1
-itsdangerous = 0.24
-lxml = 3.3.5
-meld3 = 1.0.0
-mr.developer = 1.30
-netaddr = 0.7.12
-netifaces = 0.10.4
 plone.recipe.command = 1.1
-pyOpenSSL = 0.14
-pyparsing = 2.0.2
-pytz = 2014.4
-requests = 2.3.0
-six = 1.7.3
-slapos.cookbook = 0.87
-slapos.core = 1.1.2
 slapos.recipe.build = 0.12
-slapos.recipe.cmmi = 0.2
 slapos.recipe.template = 2.5
-stevedore = 0.15
-supervisor = 3.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==1.1.2
-Flask = 0.10.1
-
-# Required by:
-# slapos.cookbook==0.87
-lock-file = 2.0
-
-# Required by:
-# slapos.core==1.1.2
-psutil = 2.1.1
-
-# Required by:
-# cffi==0.8.6
-pycparser = 2.10
-
-# Required by:
-# slapos.core==1.1.2
-zope.interface = 4.1.1

software/postgres/software.cfg

@@ -20,163 +20,5 @@ output = ${buildout:directory}/instance.cfg
 md5sum = d8b833a2054b82b6031a9420008b58fd
 mode = 0644
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
-
 [versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.6
-inotifyx = 0.2.0
-lxml = 3.1beta1
-meld3 = 0.6.10
-netaddr = 0.7.10
-pytz = 2012j
-slapos.cookbook = 0.73.1
-slapos.core = 0.34
 slapos.recipe.template = 2.4.2
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.34
-Flask = 0.9
-
-# Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
-
-# Required by:
-# slapos.core==0.34
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.34
-pyflakes = 0.6.0
-
-# Required by:
-# slapos.core==0.34
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.34
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.core==0.34
-zope.interface = 4.0.3
-

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

@@ -45,7 +45,7 @@
       "description": "Zone to be handled by the DNS cluster",
       "type": "string",
       "default": "domain.com",
-      "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$"
+      "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$"
     },
 
     "server-admin": {

software/redis-server/software.cfg

@@ -25,178 +25,6 @@ output = ${buildout:directory}/template-redis.cfg
 mode = 0644
 md5sum = f7b01ca7698c1b771f0653d64dc945a7
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Alain Takoudjou
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJANlTfgX/9cX7MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-  BAMMBkNPTVAtMDAgFw0xMzA1MzAxMTUyMDhaGA8yMTEzMDUwNjExNTIwOFowETEP
-  MA0GA1UEAwwGQ09NUC0wMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSGtkh
-  UPOcYMRiL2czmdfeHNB34nXEr5fMpglbA9RO9Cakf6YhK0jU5Y7kzAb6ZlyEzcC+
-  YkYWQZ9WCLwGuUvThg5iYlnBxmksv5Ot+5DKyTL4hdMEPCQ0RaLcXSkbxk56q3Rn
-  EQdYL+IJXS1KGMRWbl4Ql3NhShM9q7vBgyoMuwIDAQABo1AwTjAdBgNVHQ4EFgQU
-  EpO2oyW/sFAS9eojDbYo3hEOOIIwHwYDVR0jBBgwFoAUEpO2oyW/sFAS9eojDbYo
-  3hEOOIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBP02wmekqmeD23
-  90NmwDwyEznDPEJDJybREtP+T++EJ1Q/rcnxIQ5a1iOEWY4RdH87H/+2O/7nDzGs
-  L0KzeG3WDdmnxLMQ5zpG9Qd5twC0GoMl1zf+8f9/t4QE7Dn4IosP3H3dkcRDQRch
-  SKYaJZHMckKx40/hhRsyFDR1Gj215g==
-  -----END CERTIFICATE-----
-
 [versions]
-slapos.cookbook=0.78.1
-Jinja2 = 2.7
-MarkupSafe = 0.18
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-hexagonit.recipe.cmmi = 2.0
-inotifyx = 0.2.0-1
-lxml = 3.2.1
-meld3 = 0.6.10
-netaddr = 0.7.10
 plone.recipe.command = 1.1
-pytz = 2013b
-slapos.core = 0.35.1
-slapos.recipe.cmmi = 0.1.1
 slapos.recipe.template = 2.4.2
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.9
-
-# Required by:
-# slapos.cookbook==0.78.1
-lock-file = 2.0
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.2
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b2
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5

software/seleniumrunner/software.cfg

@@ -4,7 +4,6 @@ extends =
    ../../component/lxml-python/buildout.cfg
    ../../component/firefox/buildout.cfg
    ../../component/dash/buildout.cfg
-   ../../stack/shacache-client.cfg
    ../../stack/slapos.cfg
 
 # develop += /opt/slapdev
@@ -50,119 +49,3 @@ mode = 0644
 plone.recipe.command = 1.1
 slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----

software/slapos-in-partition/software.cfg

@@ -7,181 +7,9 @@
 [buildout]
 extends = common.cfg
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----
-
-
 [versions]
-slapos.libnetworkcache = 0.13.4
-Jinja2 = 2.7.1
-MarkupSafe = 0.18
 Pygments = 1.6
-Werkzeug = 0.9.4
-buildout-versions = 1.7
-cliff = 1.4.4
-cmd2 = 0.6.5.1
 collective.recipe.environment = 0.2.0
 collective.recipe.template = 1.10
-inotifyx = 0.2.0-1
-itsdangerous = 0.23
-lxml = 3.2.3
-meld3 = 0.6.10
-netaddr = 0.7.10
-netifaces = 0.10.4
-pytz = 2013d
-requests = 1.2.3
-slapos.cookbook = 0.83.1
-slapos.core = 1.0.0rc5
-slapos.recipe.cmmi = 0.2
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.5
-supervisor = 3.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==1.0.0rc5
-Flask = 0.10.1
-
-# Required by:
-# slapos.core==1.0.0rc5
-bpython = 0.12
-
-# Required by:
-# slapos.core==1.0.0rc5
-ipython = 1.0.0
-
-# Required by:
-# slapos.cookbook==0.83.1
-lock-file = 2.0
-
-# Required by:
-# slapos.core==1.0.0rc5
-zope.interface = 4.0.5
-

software/slapos-testing/instance.cfg

@@ -10,6 +10,14 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+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}
+
 [create-directory]
 recipe = slapos.cookbook:mkdirectory
 bin = $${buildout:directory}/bin
@@ -29,13 +37,17 @@ repository = ${slapos.core-repository:location}
 
 [slapos.core-setup]
 recipe = plone.recipe.command
-command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n 
+command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; export LOCAL_IPV4="$${environment:LOCAL_IPV4}"; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n 
 update-command = $${:command}
 
 [slapos.package]
 <= download-source
 repository = ${slapos.package-repository:location}
 
+[slapos.cookbook]
+<= download-source
+repository = ${slapos.cookbook-repository:location}
+
 [slapos.recipe.template]
 <= download-source
 repository = ${slapos.recipe.template-repository:location}
@@ -44,13 +56,17 @@ repository = ${slapos.recipe.template-repository:location}
 <= download-source
 repository = ${slapos.recipe.build-repository:location}
 
+[slapos.recipe.cmmi]
+<= download-source
+repository = ${slapos.recipe.cmmi-repository:location}
+
 [erp5-util]
 <= download-source
 repository = ${erp5-util-repository:location}
 
 [erp5.util-setup]
 recipe = plone.recipe.command
-command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n 
+command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n; ${python2.7:location}/bin/python setup.py test -n 
 update-command = $${:command}
 
 [officejs]
@@ -69,10 +85,12 @@ run-test-suite-binary = ${buildout:bin-directory}/runTestSuite
 # of tests should dynamically generated.
 #python-list = $${}
 test-list =
+  $${slapos.cookbook:location}
   $${slapos.core:location}
   $${slapos.package:location}
   $${slapos.recipe.template:location}
   $${slapos.recipe.build:location}
+  $${slapos.recipe.cmmi:location}
   $${erp5-util:location}
   $${jio:location}
   $${officejs:location}
@@ -83,7 +101,8 @@ environment = environment
 CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
 LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${python2.7:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${libxslt:location}/lib -Wl,-rpath=${zlib:location}/lib
 LD_LIBRARY_PATH = ${python2.7:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${libxslt:location}/lib:${zlib:location}/lib
-PYTHONPATH = ${python-setuptools:pythonpath}
+PYTHONPATH = ${python-setuptools:pythonpath}:${buildout:eggs-directory}
+LOCAL_IPV4 = $${slap-configuration:ipv4-random}
 
 [sh-environment]
 # Section exposes testing default environment as sh file. It is thus easy

software/slapos-testing/software.cfg

@@ -17,6 +17,7 @@ parts =
   slapos.package-repository
   slapos.recipe.template-repository
   slapos.recipe.build-repository
+  slapos.recipe.cmmi-repository
   erp5-util-repository
   officejs-repository
   jio-repository
@@ -37,182 +38,58 @@ entry-points =
 scripts =
   runTestSuite
 
-[slapos.cookbook-repository]
+[git-clone-repository]
 recipe = slapos.recipe.build:gitclone
 git-executable = ${git:location}/bin/git
 forbid-download-cache = true
-repository = http://git.erp5.org/repos/slapos.git
 branch = master
 
+[slapos.cookbook-repository]
+<= git-clone-repository
+repository = http://git.erp5.org/repos/slapos.git
+
 [slapos.core-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.core.git
-branch = master
 
 [slapos.package-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.package.git
-branch = master
 
 [slapos.recipe.template-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.recipe.template.git
-branch = master
 
 [slapos.recipe.build-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/slapos.recipe.build.git
-branch = master
+
+[slapos.recipe.cmmi-repository]
+<= git-clone-repository
+repository = http://git.erp5.org/repos/slapos.recipe.cmmi.git
 
 [erp5-util-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/erp5.git
-branch = master
 
 [officejs-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/officejs.git
-branch = jqs
 
 [jio-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
+<= git-clone-repository
 repository = http://git.erp5.org/repos/jio.git
-branch = master
 
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = b065539ca58a3400b0ed30093ab020ac 
+md5sum = 94bfc33413cdfbb6e243002f6d9b6928
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Cedric de Saint Martin
-#   Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
 [versions]
-Jinja2 = 2.7.1
-MarkupSafe = 0.18
 Pygments = 1.6
-Werkzeug = 0.9.4
-buildout-versions = 1.7
-cmd2 = 0.6.7
 collective.recipe.template = 1.10
-itsdangerous = 0.23
-lxml = 3.3.0beta3
-meld3 = 0.6.10
 plone.recipe.command = 1.1
-psutil = 1.2.1
-pyparsing = 2.0.1
-slapos.cookbook = 0.85
 slapos.recipe.build = 0.12
-slapos.recipe.cmmi = 0.2
 slapos.recipe.template = 2.5
-
-# Required by:
-# slapos.core==1.0.0
-Flask = 0.10.1
-
-# Required by:
-# slapos.core==1.0.0
-bpython = 0.12
-
-# Required by:
-# slapos.core==1.0.0
-cliff = 1.5.2
-
-erp5.util = 0.4.36
-
-# Required by:
-# slapos.cookbook==0.85
-inotifyx = 0.2.0-1
-
-# Required by:
-# slapos.core==1.0.0
-ipython = 1.1.0
-
-# Required by:
-# slapos.cookbook==0.85
-lock-file = 2.0
-
-# Required by:
-# slapos.cookbook==0.85
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==1.0.0
-netifaces = 0.10.4
-
-# Required by:
-# slapos.cookbook==0.85
-pytz = 2013.9
-
-# Required by:
-# slapos.core==1.0.0
-requests = 2.1.0
-
-# Required by:
-# cliff==1.5.2
-six = 1.5.2
-
-# Required by:
-# slapos.cookbook==0.85
-slapos.core = 1.0.0
-
-# Required by:
-# cliff==1.5.2
-stevedore = 0.13
-
-# Required by:
-# slapos.core==1.0.0
-supervisor = 3.0
-
-# Required by:
-# slapos.cookbook==0.85
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==1.0.0
-zope.interface = 4.0.5

software/slaprunner/README.txt

@@ -7,6 +7,9 @@ Introduction
 This software release is used to deploy Slaprunner instances.
 Slaprunner is an all-in-one IDE used to develop and test profiles and recipes for SlapOS.
 
+You can learn how to use it here :
+http://community.slapos.org/wiki/slapos-Wiki.Home/developer-Lecture.Web.Runner.Extended
+
 Parameters
 ----------
 
@@ -127,11 +130,11 @@ Example :
 Git repositories :
 ------------------
 
-It is easy to give access to your git repository/ies to everyone, or to clone it on your own computer. For this, there are 2 urls to remember:
-  - For read only, you can clone : https://[IPV6]:PORT/git-public/YourRepo.git/
-  - For read and write access, using your runner account : https://[IPV6]:PORT/git/YourRepo.git/
+It is easy to give access to your git repository/ies to everyone, or to clone it on your own computer. For this, fetch the git_url parameter returned by your webrunner instance. It should look like that : https://[IPV6]:PORT/git/YourRepo.git/
+
+To create the repo, go to the folder srv/runner/project and initiate a new git repo (git init/clone --bare YourRepo). Then, to clone the repo, just append its name to the previous URL.
 
-To create the repo, go in the folder srv/runner/project and initiate a new git repo (git init/clone --bare XXX).
+Please notice that your repositories are in public access for reading. However, an account is needed to push to the repository (use your webrunner account, or create a new user in the parameters section of the webrunner).
 
 For the moment, the PORT is the port of monitoring, which is 9685.
 
@@ -147,6 +150,7 @@ List of ports used by the webrunner:
 8949 : shellinabox
 9684 : apache (monitoring of slaprunner, git access)
 22222 : dropbear
+39986 : supervisord
 50000 : slapproxy
 50005 : webrunner (flask app), webdav access
 

software/slaprunner/TODO.txt

 - resilient sr: Cloned instances should not launch slapgrid-sr if it was not launched on export instance
 - shellinabox password should be the same in all the resilient instances
 - add test for parameter auto-deploy-instance
+- Add download facility in file browser

software/slaprunner/common.cfg

@@ -16,11 +16,10 @@ extends =
   ../../component/screen/buildout.cfg
   ../../component/shellinabox/buildout.cfg
   ../../component/vim/buildout.cfg
+  ../../stack/slapos.cfg
   ../../stack/flask.cfg
-  ../../stack/shacache-client.cfg
   ../../stack/resilient/buildout.cfg
   ../../stack/monitor/buildout.cfg
-  ../../stack/slapos.cfg
 
 parts =
   template
@@ -44,14 +43,14 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 9878115a2969489b57e8563ef3d4d6d3
+md5sum = a4f3127bc82ff3a671a65a150f26c969
 mode = 0644
 
 [template-runner-import-script]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
 download-only = true
-md5sum = b003f6a6963f7787948be85c3d479ccd
+md5sum = d64529e263d42b0b56e5fe3a976d18c9
 filename = runner-import.sh.jinja2
 mode = 0644
 
@@ -59,14 +58,14 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = 354ff83819e8379f5e4a2e2985e34e9e
+md5sum = a85d054b3e2ae9243d8d188c897dc121
 mode = 0644
 
 [template-runner-export-script]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/runner-export.sh.jinja2
 download-only = true
-md5sum = 246167ed081027618ef127a6fffd13ed
+md5sum = e74a0cbda64182c7fdff42cc46f07a12
 filename = runner-export.sh.jinja2
 mode = 0644
 
@@ -74,13 +73,13 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 6930a0d6c88896c43a8e60509ba6bd1c
+md5sum = 521bad4c571b5b2dc3eee6090802de95
 mode = 0644
 
 [template-resilient]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 1f7332d0b0671929a2de87ef9ce998c8
+md5sum = aec7fb7fe57b48c5c26c7adcdff36d26
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 
@@ -88,7 +87,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
 download-only = true
-md5sum = abba49f5f397bfe6f6ea5e5dd185b1e9
+md5sum = 01545742e97b4b95cd5e14d5d7cb1584
 filename = instance-resilient-test.cfg.jinja2
 mode = 0644
 
@@ -104,7 +103,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/httpd_conf.in
 download-only = true
-md5sum = 63782f8eaa94af729ec6bba80e062d8f
+md5sum = 94bc5d6f1afc4e075d530fed496f47c2
 filename = httpd_conf.in
 mode = 0644
 
@@ -119,13 +118,13 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [template-slapos-cfg]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = 847df63cf5a226ed338d7ca34b0220b5
+md5sum = ca57a8bf1d4da20344fab602a69b807f
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 download-only = true
 mode = 0644
 
-[parameters-template]
+[template-parameters]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 md5sum = f8446fcf254b4929eb828a9a1d7e5f62
@@ -134,6 +133,42 @@ filename = parameters.xml.in
 download-only = true
 mode = 0644
 
+[template-bash-profile]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/${:filename}
+md5sum = 39dc910743c70d5120a778779a052cad
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = bash_profile.in
+download-only = true
+mode = 0644
+
+[template-supervisord]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/${:filename}
+md5sum = 239fe88e1522afe7686572dd34568720
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = supervisord.conf.in
+download-only = true
+mode = 0644
+
+[template-listener-slapgrid]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/${:filename}
+md5sum = 49d50410cf7467175a841eb7cd0d93d4
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+filename = listener_slapgrid.py.in
+download-only = true
+mode = 0644
+
+[cors-domain-cgi]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/${:filename}
+download-only = true
+md5sum = 4c44d617d5bfd1db8695200e896480c0
+destination = ${buildout:parts-directory}/monitor-template-cors-domain-cgi
+filename = cors-domain.jinja
+mode = 0644
+
 [eggs]
 recipe = z3c.recipe.scripts
 eggs =
@@ -153,6 +188,7 @@ eggs =
   slapos.recipe.build
   slapos.toolbox[flask_auth]
   slapos.core
+  supervisor
   xml_marshaller
   Gunicorn
 
@@ -172,3 +208,9 @@ eggs =
   xml_marshaller
   pytz
   slapos.libnetworkcache
+
+[extra-eggs]
+recipe = zc.recipe.egg
+interpreter = pythonwitheggs
+eggs +=
+  supervisor

software/slaprunner/httpd_conf.in

@@ -21,9 +21,13 @@ LoadModule ssl_module modules/mod_ssl.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule env_module modules/mod_env.so
 LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule dav_module modules/mod_dav.so
 LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule cache_module modules/mod_cache.so
+LoadModule file_cache_module modules/mod_file_cache.so
+LoadModule setenvif_module modules/mod_setenvif.so
 
 ErrorLog "{{ parameters.path_error_log }}"
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
@@ -42,6 +46,11 @@ SSLHonorCipherOrder On
 SSLCipherSuite RC4-SHA:HIGH:!ADH
 SSLEngine   On
 
+Include {{ parameters.httpd_cors_file }}
+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"
+
 Alias /public {{ parameters.runner_home }}/public
 <Directory {{ parameters.runner_home }}/public>
     Order Allow,Deny
@@ -66,22 +75,22 @@ Alias /share {{ parameters.runner_home }}
     AuthType Basic
     AuthName "webdav"
     AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
-    Require valid-user
+    <LimitExcept OPTIONS>
+        Require valid-user
+    </LimitExcept>
 </Directory>
 
 ScriptSock {{ parameters.path_pid }}
 
-SetEnv GIT_PROJECT_ROOT {{ parameters.project_folder }}
 SetEnv GIT_HTTP_EXPORT_ALL
 ScriptAlias /git/ {{ parameters.git_http_backend }}/
 ScriptAlias /git-public/ {{ parameters.git_http_backend }}/
 
 RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]
 RewriteCond %{REQUEST_URI} /git-receive-pack$
-RewriteRule ^/git/ - [E=AUTHREQUIRED:yes]
-RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes]
 
-<LocationMatch "^/git-public/">
+<LocationMatch "^/git/">
+        SetEnv GIT_PROJECT_ROOT:{{- parameters.project_private_folder -}}
         Order Deny,Allow
         Deny from env=AUTHREQUIRED
 
@@ -89,10 +98,10 @@ RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes]
         AuthName "Git Access"
         AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
         Require valid-user
-        Satisfy any
 </LocationMatch>
 
-<LocationMatch "^/git/">
+<LocationMatch "^/git-public/">
+        SetEnv GIT_PROJECT_ROOT:{{- parameters.project_public_folder -}}
         Order Deny,Allow
         Deny from env=AUTHREQUIRED
 
@@ -100,6 +109,7 @@ RewriteRule ^/git-public/ - [E=AUTHREQUIRED:yes]
         AuthName "Git Access"
         AuthUserFile "{{ parameters.etc_dir }}/.htpasswd"
         Require valid-user
+        Satisfy any
 </LocationMatch>
 
 include {{ parameters.cgi_httpd_conf }}

software/slaprunner/instance-resilient-test.cfg.jinja2

@@ -42,7 +42,7 @@ software-url = ${slap-connection:software-release-url}
 software-type = resilient
 name = Resilient Instance (Root Instance)
 {% set cluster_parameter_dict = slapparameter_dict.get('cluster', {}) -%}
-config = resiliency-backup-periodicity {{ cluster_parameter_dict.keys() | join(' ') }}
+config = resiliency-backup-periodicity resilient-clone-number {{ cluster_parameter_dict.keys() | join(' ') }}
 {% for key, value in cluster_parameter_dict.items() -%}
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}

software/slaprunner/instance-resilient.cfg.jinja2

@@ -28,7 +28,7 @@ parts +=
 
 # Bubble up the parameters
 [request-runner]
-return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url webdav_url public_url
+return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url webdav_url public_url git_public_url git_private_url
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
@@ -41,6 +41,8 @@ ssh_command = ${request-runner:connection-ssh_command}
 monitor_url = ${request-runner:connection-monitor_url}
 webdav_url = ${request-runner:connection-webdav_url}
 public_url = ${request-runner:connection-public_url}
+git_public_url = ${request-runner:connection-git_public_url}
+git_private_url = ${request-runner:connection-git_private_url}
 
 [slap-parameter]
 # Default parameters for distributed deployment

software/slaprunner/instance-runner-export.cfg.in

@@ -27,6 +27,7 @@ parts +=
   cron-entry-prepare-software
   deploy-instance-parameters
   minishell-cwd
+  supervisord-wrapper
 ## Monitoring part
 ###Parts to add for monitoring
   cron
@@ -45,6 +46,7 @@ parts +=
   cgi-httpd-graceful-wrapper
   monitor-promise
   monitor-instance-log-access
+  bash-profile
 ## Monitor for runner
   monitor-current-log-access
   monitor-check-resilient-feed-file

software/slaprunner/instance-runner-import.cfg.in

@@ -24,6 +24,8 @@ parts +=
   cron-entry-prepare-software
   deploy-instance-parameters
   instance-software-type
+  bash-profile
+  supervisord-wrapper
 # have to repeat the next one, as it's not inherited from pbsready-import
   import-on-notification
 ## Monitoring part
@@ -82,4 +84,4 @@ rendered = $${monitor-directory:monitoring-cgi}/latest-restored-backup
 template = ${template-wrapper:output}
 mode = 744
 context =
-  key content :command
\ No newline at end of file
+  key content :command

software/slaprunner/instance-runner-input-schema.json

+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "properties": {
+        "user-authorized-key": {
+            "title": "User Authorized Key",
+            "description": "SSH public key in order to connect to the SSH server of this runner instance.",
+            "type": "string",
+        },
+        "instance-amount": {
+            "title": "Partition Amount",
+            "description": "Number of slappart to deploy inside the runner (default is 10). Needs instance to be restarted.",
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 40,
+        },
+        "slapos-software": {
+            "title": "Pre-selected Software Release",
+            "description": "a relative path from the slapos git repo to a folder containing a software release, which will be automaticaly deployed while the runner instanciation, and only if the parameter auto-deploy is set to 'true'. For example: 'software/helloworld",
+            "type": "string",
+        },
+        "auto-deploy": {
+            "title": "Automatically Deploy Software",
+            "description": "Authorizes the software declared with 'slapos-software' to be automatically deployed, or not. Needs instance to be restarted. (default is false)",
+            "type": "boolean",
+        },
+        "slapos-repository": {
+            "title": "SlapOS Git Repository URL",
+            "description": "url of the default git repository that will be download by the runner while its instanciation. Will be cloned in a directory named 'slapos' (default is http://git.erp5.org/repos/slapos.git)",
+            "type": "string",
+            "format": "uri",
+            "pattern": "^(http|https|ftp)://",
+        },
+        "slapos-reference": {
+            "title": "SlapOS Git Branch Name",
+            "description": "Branch or hash on which the default repository will checkout (default is master)",
+            "type": "string",
+        },
+        "auto-deploy-instance": {
+            "title": "Automatically Deploy Instances",
+            "description": "Prevent the runner from deploying and starting instances. Needs instance to be restarted. It is set to false for instances of type 'import' in resiliency in any case (default is false)",
+            "type": "boolean",
+        },
+        "autorun": {
+            "title": "Automatically Run Sofware/Instance",
+            "description": "Let automaticaly build and run a declared software with 'slapos-software'. Only works if 'slapos-software' is set, and 'auto-deploy' is true. Needs instance to be restarted. (default is false)",
+            "type": "boolean",
+        },
+        "slapos-software-type": {
+            "title": "Deployed Instance Software Type" ,
+            "description": "Software type of your instance inside the runner",
+            "type": "string",
+        },
+        "custom-frontend-backend-url": {
+            "title": "Custom Frontend Backend URL",
+            "description": "return an ipv4 frontend of the given ipv6(+optional port)",
+            "type": "string",
+            "format": "uri",
+        },
+        "custom-frontend-backend-type": {
+            "title": "Custom Frontend Backend Type",
+            "description": "The type of the frontend slave instance to ask",
+            "type": "string",
+            "enum": ["zope"],
+        },
+        "custom-frontend-basic-auth": {
+            "title": "Custom Frontend Basic Auth",
+            "description": "if the ip given with 'custom-frontend-backend-url' is secure, set it to true for the promise do not fail",
+            "type": "boolean",
+        },
+        "custom-frontend-instance-guid": {
+            "title": "Custom Frontend Instance GUID",
+            "description": "Instance guid of the frontend you whish to use",
+            "type": "string",
+        },
+        "custom-frontend-software-type": {
+            "title": "Custom Frontend Software Type",
+            "description": "SoftwareType of the frontend you request (default is RootSoftwareInstance)",
+            "type": "string",
+            "enum": ["RootSoftwareInstance", "default"],
+        },
+        "custom-frontend-software-url": {
+            "title": "Custom Frontend Software URL",
+            "description": "Software Url of the frontend you request (ie.: http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg)",
+            "type": "string",
+            "format": "uri",
+        },
+        "monitor-port": {
+            "title": "Monitor Port",
+            "description": "Allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server (default 9684)",
+            "type": "integer",
+            "minimum": 9683,
+            "exclusiveMinimum": true,
+        },
+        "cpu-usage-ratio": {
+            "description": "Ratio of the CPU use for compilation, if value is set to n, compilation will use number-of-cpu/n of cpus (need instance restart)",
+            "type": "integer",
+            "default" : 4
+        },
+        "resilient-clone-number": {
+            "title": "Number of Resilient Clones",
+            "description": "Number of clones to be deployed when a resilient runner, if missing a single clone is provided. Its value can be 1 or 2",
+            "type": "integer",
+            "enum": [1, 2],
+        }
+    }
+}

software/slaprunner/instance-runner-output-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Values returned by Runner instanciation",
+  "properties": {
+    "backend_url": {
+      "description": "ipv6 url to directly access your runner",
+      "type": "string"
+    },
+    "access_url": {
+      "description": "Url to set up your account and then login into your webrunner",
+      "type": "string"
+    },
+    "url": {
+      "description": "Url to access your runner once you set your account",
+      "type": "string"
+    },
+    "ssh_command": {
+      "description": "SSH command used to access your runner in ssh when you provided a ssh public key"
+      "type": "string"
+    },
+    "monitor_url": {
+      "description": "Url to access the monitoring interface of your instance. Use this url to get the recovery code needed to set up your runner",
+      "type": "string"
+    },
+    "webdav_url": {
+      "description": "Url for webdav access of your runner it access the root of your runner. Same users as the one for the runner",
+      "type": "string"
+    },
+    "public_url": {
+      "description": "Url of the public folder of your runner",
+      "type": "string"
+    },
+    "git_public_url": {
+      "description": "Public url of your repositories.",
+      "type": "string"
+    },
+    "git_private_url": {
+      "description": "Private url for your repositories. You can use it to push.",
+      "type": "string"
+    }
+  },
+  "type": "object"
+}
\ No newline at end of file

software/slaprunner/instance-runner.cfg

@@ -24,6 +24,9 @@ parts =
   deploy-instance-parameters
   instance-software-type
   minishell-cwd
+  bash-profile
+  supervisord-wrapper
+  supervisord-promise
 {% if slapparameter_dict.get('custom-frontend-backend-url') %}
   custom-frontend-promise
 {% endif %}
@@ -47,6 +50,7 @@ parts =
   monitor-instance-log-access
 ## Monitor for runner
   monitor-current-log-access
+  monitor-deploy-cors-domain-cgi
 
 extends = ${monitor-template:output}
 
@@ -136,6 +140,8 @@ project-test = $${:test}/project
 software-test = $${:test}/software
 instance-test = $${:test}/instance
 sessions = $${buildout:directory}/.sessions
+private-project = $${:home}/.git-private
+public-project = $${:home}/.git-public
 
 #Create password recovery code for slaprunner
 [recovery-code]
@@ -155,8 +161,7 @@ working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}
 instance_root = $${runnerdirectory:instance-root}
 software_root = $${runnerdirectory:software-root}
-#XXX-Nico hardcoded default port because overridden by this buildout config
-instance-monitor-url = https://[$${:ipv6}]:9685
+instance-monitor-url = https://[$${:ipv6}]:$${monitor-parameters:port}
 etc_dir = $${directory:etc}
 log_dir =  $${directory:log}
 run_dir = $${directory:run}
@@ -173,6 +178,7 @@ wrapper = $${directory:services}/slaprunner
 debug = $${slap-parameter:debug}
 access-url = https://[$${:ipv6}]:$${:runner_port}
 supervisord_config = $${directory:etc}/supervisord.conf
+supervisord_server = http://$${supervisord:server}
 proxy_database = $${slaprunner:working-directory}/proxy.db
 console = False
 verbose = False
@@ -183,6 +189,9 @@ autorun = $${slap-parameter:autorun}
 knowledge0_file = $${buildout:directory}/$${public:filename}
 minishell_cwd_file = $${directory:etc}/.minishell-cwd
 minishell_history_file = $${directory:etc}/.minishell_history
+software_info_json = $${runnerdirectory:home}/software_info.json
+instance_info_json = $${runnerdirectory:home}/instance_info.json
+path = $${shell:path}
 
 [test-runner]
 <= slaprunner
@@ -200,7 +209,7 @@ auto_deploy = True
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:directory}/bin/slaprunnertest
 wrapper-path = $${directory:bin}/runTestSuite
-environment = RUNNER_CONFIG=$${slapos-test-cfg:rendered}
+environment = RUNNER_CONFIG=$${slapos-cfg:rendered}
 
 # Deploy dropbear (minimalist SSH server)
 [sshkeys-directory]
@@ -219,7 +228,7 @@ keygen-binary = ${dropbear:location}/bin/dropbearkey
 recipe = slapos.cookbook:dropbear
 host = $${slap-network-information:global-ipv6}
 port = 22222
-home = $${directory:ssh}
+home = $${buildout:directory}
 wrapper = $${directory:bin}/runner_sshd
 shell = ${bash:location}/bin/bash
 rsa-keyfile = $${directory:ssh}/server_key.rsa
@@ -316,9 +325,12 @@ dav_lock = $${directory:var}/DavLock
 etc_dir = $${directory:etc}
 var_dir = $${directory:var}
 project_folder = $${directory:project}
+project_private_folder = $${runnerdirectory:private-project}
+project_public_folder = $${runnerdirectory:public-project}
 runner_home = $${runnerdirectory:home}
 git_http_backend = ${git:location}/libexec/git-core/git-http-backend
 cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
+httpd_cors_file = $${monitor-httpd-cors:location}
 
 [httpd-conf]
 recipe = slapos.recipe.template:jinja2
@@ -351,6 +363,7 @@ error-log-file = gunicorn-error.log
 wrapper-path = $${gunicorn:bin_launcher}
 environment = PATH=$${environ:PATH}:${git:location}/bin/
   RUNNER_CONFIG=$${slaprunner:slapos.cfg}
+  LANG=en_GB.UTF-8
 
 [gunicorn-graceful]
 recipe = slapos.cookbook:wrapper
@@ -440,7 +453,7 @@ ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:p
 monitor_url = https://$${monitor-frontend:connection-domain}
 webdav_url = $${:monitor_url}/share/
 public_url =  $${:monitor_url}/public/
-git_public_url =  https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git-public/
+git_public_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git-public/
 git_private_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git/
 
 #---------------------------
@@ -459,6 +472,7 @@ path = $${directory:promises}/slaprunner_frontend
 url = https://$${request-frontend:connection-domain}/login
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
+check-secure = 1
 
 [dropbear-promise]
 recipe = slapos.cookbook:check_port_listening
@@ -570,7 +584,7 @@ command = $${prepare-software:wrapper-path}
 [instance-parameters]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
-template = ${parameters-template:location}/${parameters-template:filename}
+template = ${template-parameters:location}/${template-parameters:filename}
 rendered = $${directory:etc}/.parameter.xml.default
 mode = 0644
 context =
@@ -610,6 +624,104 @@ command = if [ ! -f $${slaprunner:minishell_cwd_file} ]; then echo $${runnerdire
 location = $${slaprunner:minishell_cwd_file}
 stop-on-error = true
 
+[bash-profile]
+recipe = slapos.recipe.template:jinja2
+template = ${template-bash-profile:location}/${template-bash-profile:filename}
+rendered = $${buildout:directory}/.bash_profile
+context =
+    raw path $PATH:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin
+    key workdir runnerdirectory:home
+
+[supervisord]
+autorestart = false
+autostart = false
+directory = $${buildout:directory}
+exitcodes = 0
+logfile = $${directory:log}/supervisord.log
+no_logfile = NONE
+numprocs = 1
+path = $${environ:PATH}
+pidfile = $${directory:run}/supervisord.pid
+server = $${slaprunner:ipv4}:$${:port}
+port = 39986
+slapgrid-cp = slapgrid-cp
+slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log}
+slapgrid-cp-log = $${runnerdirectory:home}/instance.log
+slapgrid-cp-pid = $${directory:run}/slapgrid-cp.pid
+slapgrid-cp-startretries = 0
+slapgrid-sr = slapgrid-sr
+slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-sr-pid} --verbose --logfile $${:slapgrid-sr-log}
+slapgrid-sr-log = $${runnerdirectory:home}/software.log
+slapgrid-sr-pid = $${directory:run}/slapgrid-sr.pid
+slapgrid-sr-startretries = 0
+slapproxy = slapproxy
+slapproxy-autorestart = true
+slapproxy-autostart = true
+slapproxy-startsecs = 1
+slapproxy-command = $${slaprunner:slapos} proxy start --logfile $${:slapproxy-log} --cfg $${:slapos-cfg}
+slapproxy-log = $${directory:log}/slapproxy.log
+socket_name = unix://$${:socket_path}
+socket_path = $${directory:tmp}/supervisord.sock
+startsecs = 0
+# This file logs errors from listeners. Supervisord has its own logfile.
+# Processes should handle their logs by themselves
+stderr_logfile = $${directory:log}/supervisord-errors.log
+slapos-cfg = $${slaprunner:slapos.cfg}
+
+[supervisord-conf]
+recipe = slapos.recipe.template:jinja2
+template = ${template-supervisord:location}/${template-supervisord:filename}
+rendered = $${directory:etc}/supervisord.conf
+context =
+    import multiprocessing multiprocessing
+    import builtin __builtin__
+    section supervisord supervisord
+    key slapparameter_dict slap-configuration:configuration
+    key listener_slapgrid listener-slapgrid-bin:rendered
+
+[listener-slapgrid-bin]
+recipe = slapos.recipe.template:jinja2
+template = ${template-listener-slapgrid:location}/${template-listener-slapgrid:filename}
+rendered = $${directory:bin}/listener_slapgrid.py
+mode = 0744
+context =
+    section supervisord supervisord
+    section slaprunner slaprunner
+    raw python_executable ${buildout:directory}/bin/${extra-eggs:interpreter}
+
+[supervisord-wrapper]
+recipe = slapos.cookbook:wrapper
+command-line = $${buildout:directory}/bin/supervisord -c $${supervisord-conf:rendered} --nodaemon
+wrapper-path = $${directory:services}/supervisord
+
+[supervisord-promise]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promises}/supervisord
+hostname = $${slaprunner:ipv4}
+port = $${supervisord:port}
+
 [monitor-current-log-access]
 < = monitor-directory-access
 source = $${directory:log}
+
+[monitor-deploy-cors-domain-cgi]
+recipe = slapos.recipe.template:jinja2
+template = ${cors-domain-cgi:location}/${cors-domain-cgi:filename}
+rendered = $${monitor-directory:knowledge0-cgi}/$${:filename}
+filename = cors-domain.cgi
+mode = 0744
+context =
+  raw config_cfg $${buildout:directory}/knowledge0.cfg
+  raw timestamp $${buildout:directory}/.timestamp
+  raw python_executable ${buildout:executable}
+  key apache_file httpd-parameters:httpd_cors_file
+  key pwd monitor-directory:knowledge0-cgi
+  key this_file :filename
+  key httpd_graceful cgi-httpd-graceful-wrapper:rendered
+
+[monitor-httpd-cors]
+recipe = plone.recipe.command
+command = if [ ! -f $${:location} ]; then touch $${:location}; fi
+location = $${directory:etc}/$${:filename}
+filename = httpd-cors.cfg
+stop-on-error = true

software/slaprunner/schema.json

-{
-        "$schema": "http://json-schema.org/draft-04/schema#",
-                "properties": {
-                        "user-authorized-key": {
-                                "description" : "SSH public key in order to connect to the SSH server of this runner instance",
-                                "type": "string"
-                        },
-                        "instance-amount": {
-                                "description": "number of slappart to deploy inside the runner. Needs instance to be restarted.",
-                                "type": "integer",
-                                "default": 10
-                        },
-                        "slapos-software": {
-                                "description": "a relative path from the slapos git repo to a folder containing a software release, which will be automaticaly deployed while the runner instanciation, and only if the parameter auto-deploy is set to 'true'. For example: 'software/helloworld",
-                                "type": "string"
-                        },
-                        "auto-deploy": { "description": "authorizes the software declared with 'slapos-software' to be automatically deployed, or not. Needs instance to be restarted.",
-                                "type": "boolean",
-                                "default": "false"
-                        },
-                        "slapos-repository": {
-                                "description": "url of the default git repository that will be download by the runner while its instanciation. Will be cloned in a directory named 'slapos'",
-                                "type": "string",
-                                "default": "http://git.erp5.org/repos/slapos.git"
-                        },
-                        "slapos-reference": {
-                                "description": "commit reference on which the default repository will checkout",
-                                "type": "string",
-                                "default": "master"
-                        },
-                        "auto-deploy-instance": {
-                                "description": "prevent the runner from deploying and starting instances. Needs instance to be restarted.",
-                                "type": "boolean",
-                                "default": "true, but is set to false for instances of type 'import' in resiliency"
-                        },
-                        "autorun": {
-                                "description": "let automaticaly build and run a declared software with 'slapos-software'. Only works if 'slapos-software' is set, and 'auto-deploy' is true. Needs instance to be restarted.",
-                                "type": "boolean",
-                                "default": "false"
-                        },
-                        "slapos-software-type": {
-                                "description": "Software type of your instance inside the runner",
-                                "type": "string"
-                        },
-                        "parameter-*": {
-                                "description": "'*' is a parameter which will be used to configure the instance inside the runner.",
-                                "type": "string"
-                        },
-                        "custom-frontend-backend-url": {
-                                "description": "return an ipv4 frontend of the given ipv6(+optional port)",
-                                "type": "string"
-                        },
-                        "custom-frontend-backend-type": {
-                                "description": "The type of the frontend slave instance to ask",
-                                "type": "string"
-                        },
-                        "custom-frontend-basic-auth": {
-                                "description": "if the ip given with 'custom-frontend-backend-url' is secure, set it to true for the promise do not fail",
-                                "type": "boolean",
-                                "default": "false"
-                        },
-                        "custom-frontend-instance-guid": {
-                                "description": "Instance guid of the frontend you whish to use",
-                                "type": "string",
-                                "default": "none"
-                        },
-                        "custom-frontend-software-type": {
-                                "description": "SoftwareType of the frontend you request",
-                                "default": "RootSoftwareInstance",
-                                "type": "string"
-                        },
-                        "custom-frontend-software-url": {
-                                "description": "Software Url of the frontend you request",
-                                "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
-                                "type": "string"
-                        },
-                        "monitor-port": {
-                                "description": "allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server",
-                                "type": "integer",
-                                "default": 9684
-                        }
-                        "resilient-clone-number": {
-                                "description": "is the number of clones to be deployed when a resilient runner is ordered. Its value can be 1 or 2",
-                                "type": "integer",
-                                "default" : 1
-                        }
-                }
-}

software/slaprunner/software.cfg

@@ -2,183 +2,10 @@
 # Exactly the same as common.cfg, but:
 # 1/ Use a defined set of Python eggs instead of using the latest available
 #    ones from Pypi, to ensure stability;
-# 2/ Define list of trusted certificates for the cache.
 
 [buildout]
 extends = common.cfg
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Cedric de Saint Martin
-#   Test Agent
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-#   Nicolas Wavrant
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY= 
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----
-#  -----BEGIN CERTIFICATE-----
-#  MIIB+DCCAWGgAwIBAgIJAJAOvB8P2YYMMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-#  BAMMCUNPTVAtMTg1MjAgFw0xMzEyMDMxMjU5NDJaGA8yMTEzMTEwOTEyNTk0Mlow
-#  FDESMBAGA1UEAwwJQ09NUC0xODUyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-#  gQDgR2qKVURmOUmzc7KVL2Gk2VezWlHlJy3V3k1WVYahhFsSjf3O4VyTtroHbIGu
-#  YMJaHLSvGvvvkVJIz/DKqOvl1/6435t+coYECimvzqzTBDWFlEKJbEixz/3nPnXe
-#  CFqVzuCQ7e3nRIrIGLml6jZnXwPlzx8ANn1LO8pwKHj+xwIDAQABo1AwTjAdBgNV
-#  HQ4EFgQUvo7qkSq82Ax5/vnxHoJOhySQSGowHwYDVR0jBBgwFoAUvo7qkSq82Ax5
-#  /vnxHoJOhySQSGowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCbNxtq
-#  BckDSWb92gy/p+JbkMXLjRSSWgeKafvWQXMXpPHW847CPzUDB7zT0rT8a8SRjVuL
-#  Vt/oo2VlJ9xbKEz/qppX8w1TwEZhEJk6h8ky51s2EyyITUy8LHESJes9l46DRbr8
-#  Rm6WS5sk5oiCd146YkWhfZuOsQHXSG/+WC/GPQ==
-#  -----END CERTIFICATE-----
-
 [versions]
 Flask-Auth = 0.85
 PyRSS2Gen = 1.1
@@ -187,34 +14,31 @@ async = 0.6.1
 cns.recipe.symlink = 0.2.3
 collective.recipe.environment = 0.2.0
 collective.recipe.template = 1.11
+ecdsa = 0.11
 erp5.util = 0.4.41
 gitdb = 0.5.4
-gunicorn = 19.1.0
+gunicorn = 19.1.1
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
 slapos.recipe.build = 0.12
 slapos.recipe.download = 1.0.dev-r4053
-slapos.toolbox = 0.39.3
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.40.2
 atomize = 0.2.0
 
 # Required by:
-# paramiko==1.14.0
-ecdsa = 0.11
-
-# Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
-# slapos.toolbox==0.39.3
-paramiko = 1.14.0
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

software/slaprunner/software.cfg.json

+{
+  "name": "Web Runner",
+  "description": "Web Runner",
+  "serialisation": "xml",
+  "software-type": {
+    "default": {
+      "title": "Default",
+      "description": "Standalone Runner",
+      "request": "instance-runner-input-schema.json",
+      "response": "instance-runner-output-schema.json",
+      "index": 0
+    },
+    "resilient": {
+      "title": "Resilient", 
+      "description": "Resilient Runner",
+      "request": "instance-runner-resilient-input-schema.json",
+      "response": "instance-runner-output-schema.json",
+      "index": 1
+    }
+  }
+}

software/slaprunner/template/bash_profile.in

+# Beware, this file is automatically processed by slapgrid
+# Do not modify it, your changes will be lost
+# If you want to load your custom bash configuration, please use a .bashrc file
+
+cd {{ workdir }}
+export PATH={{- path }}
+export PS1="\w $ "
+export LANG="en_GB.UTF-8"

software/slaprunner/template/cors-domain.jinja

+#!{{ python_executable }}
+
+import cgi
+import cgitb
+import ConfigParser
+import os
+import re
+import subprocess
+
+cgitb.enable(display=0, logdir="/tmp/cgi.log")
+form = cgi.FieldStorage()
+
+apache_file = "{{ apache_file }}"
+config_file = "{{ config_cfg }}"
+
+
+if not os.path.exists(config_file):
+  print "Your software does <b>not</b> embed 0-knowledge. \
+  This interface is useless in this case</body></html>"
+  exit(0)
+
+
+parser = ConfigParser.ConfigParser()
+parser.read(config_file)
+if not parser.has_section("cors"):
+  parser.add_section("cors")
+
+if not parser.has_option("cors", "cors-domain"):
+  parser.set("cors", "cors-domain", "")
+
+if "cors-domain" in form:
+  parser.set("cors", "cors-domain", form["cors-domain"].value)
+  cors_domain_list = form["cors-domain"].value.split()
+  cors_string = ""
+  for domain in cors_domain_list:
+    if cors_string:
+      cors_string += '|'
+    cors_string += re.escape(domain)
+  with open(apache_file, 'w') as file:
+    file.write('SetEnvIf Origin "^http(s)?://(.+\.)?(%s)$" origin_is=$0\n' % cors_string)
+    file.write('Header always set Access-Control-Allow-Origin %{origin_is}e env=origin_is')
+  subprocess.call('{{ httpd_graceful }}')
+
+cors_domain_parameter = parser.get("cors", "cors-domain")
+
+with open(config_file, 'w') as file:
+  parser.write(file)
+
+print "<html><head>"
+print "<link rel=\"stylesheet\" href=\"static/pure-min.css\">"
+print "<link rel=\"stylesheet\" href=\"static/style.css\">"
+print "</head><body>"
+print "<h1>Cors Domains :</h1>"
+print "<p>Enter domain names separated by space to authorized CORS on your dav storage for these domains</p>"
+print "<form action=\"/index.cgi\" method=\"post\" class=\"pure-form-aligned\">"
+print "<input type=\"hidden\" name=\"posting-script\" value=\"{{ pwd }}/{{ this_file }}\">"
+print "<div class=\"pure-control-group\">"
+print '<label for="cors-domain">CORS Domains</label>'
+print '<input type="text" name="cors-domain" value="%s">' % cors_domain_parameter
+print "</div>"
+print "<div class=\"pure-controls\"><button type=\"submit\" class=\"pure-button \
+ pure-button-primary\">Save</button></div></form>"
+print "</body></html>"

software/slaprunner/template/listener_slapgrid.py.in

+#!{{ python_executable }}
+
+import datetime
+import json
+import sys
+import xmlrpclib
+
+from supervisor import childutils
+
+
+def write_stdout(s):
+    sys.stdout.write(s)
+    sys.stdout.flush()
+
+def write_stderr(s):
+    sys.stderr.write(s)
+    sys.stderr.flush()
+
+
+def write_slapgrid_result(process):
+    server = xmlrpclib.Server("http://{{- supervisord['server'] -}}")
+    # Tuple of tuples containing 2 elements : process name and the path of its info file
+    json_files = dict([("slapgrid-sr", "{{- slaprunner['software_info_json'] -}}"),
+                       ("slapgrid-cp", "{{- slaprunner['instance_info_json'] -}}")])
+    info = server.supervisor.getProcessInfo(process)
+    result = dict()
+    result['last_build'] = datetime.datetime.fromtimestamp(info['stop']).strftime("%Y-%m-%d %H:%M:%S")
+    result['success'] = info['exitstatus']
+    open(json_files[process], 'w').write(json.dumps(result))
+
+
+def main():
+    while 1:
+        headers, payload = writer.wait()
+        try:
+            processname = dict(x.split(':') for x in payload.split())['processname']
+            write_slapgrid_result(processname)
+        except:
+            pass
+        writer.ok()
+
+if __name__ == '__main__':
+    writer = childutils.EventListenerProtocol()
+    main()

software/slaprunner/template/runner-export.sh.jinja2

@@ -11,7 +11,7 @@ sync_element () {
   do
     cd $path;
     if [ -f $element ] || [ -d $element ]; then
-       {{ rsync_binary }} -avz --safe-links --delete $element  $backup_path;
+       {{ rsync_binary }} -av --safe-links --delete $element  $backup_path;
     fi
   done
 }

software/slaprunner/template/runner-import.sh.jinja2

@@ -9,7 +9,7 @@ restore_element () {
   do
     cd $backup_path;
     if [ -f $element ] || [ -d $element ]; then
-       {{ rsync_binary }} -avz --delete $backup_path/$element $restore_path;
+       {{ rsync_binary }} -av --delete $backup_path/$element $restore_path;
     fi
   done
 }

software/slaprunner/template/slapos.cfg.in

@@ -15,6 +15,7 @@ slapos_cfg = {{ slaprunner['slapos.cfg'] }}
 slapproxy = {{ slaprunner['slapproxy'] }}
 supervisor = {{ slaprunner['supervisor'] }}
 supervisord_config = {{ slaprunner['supervisord_config'] }}
+supervisord_server = {{ slaprunner['supervisord_server'] }}
 runner_workdir = {{ slaprunner['working-directory'] }}
 runner_host = {{ slaprunner['ipv4'] }}
 runner_port = {{ slaprunner['runner_port'] }}
@@ -33,6 +34,7 @@ autorun = {{ slaprunner['autorun'] }}
 knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
 minishell_cwd_file = {{ slaprunner['minishell_cwd_file'] }}
 minishell_history_file = {{ slaprunner['minishell_history_file'] }}
+path = {{ slaprunner['path'] }}
 
 [slapproxy]
 host = {{ slaprunner['ipv4'] }}

software/slaprunner/template/supervisord.conf.in

+[unix_http_server]
+file = {{ supervisord['socket_path'] }}
+
+[supervisorctl]
+serverurl = {{ supervisord['socket_name'] }}
+
+[inet_http_server]
+port = {{ supervisord['server'] }}
+
+[supervisord]
+logfile = {{ supervisord['logfile'] }}
+pidfile = {{ supervisord['pidfile'] }}
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[program:{{- supervisord['slapgrid-sr'] -}}]
+command = {{ supervisord['slapgrid-sr-command'] }}
+process_name = {{ supervisord['slapgrid-sr'] }}
+numprocs = {{ supervisord['numprocs'] }}
+autostart = {{ supervisord['autostart'] }}
+exitcodes = {{ supervisord['exitcodes'] }}
+startretries = {{ supervisord['slapgrid-sr-startretries'] }}
+startsecs = {{ supervisord['startsecs'] }}
+autorestart = {{ supervisord['autorestart'] }}
+stdout_logfile = {{ supervisord['no_logfile'] }}
+stderr_logfile = {{ supervisord['no_logfile'] }}
+directory = {{ supervisord['directory'] }}
+environment = PATH="{{- supervisord['path'] -}}",MAKEFLAGS="-j{{- '%d' % builtin.max(1, (multiprocessing.cpu_count() / builtin.int(slapparameter_dict.get('cpu-usage-ration', 4)))) -}}"
+
+[program:{{- supervisord['slapgrid-cp'] -}}]
+command = {{ supervisord['slapgrid-cp-command'] }}
+process_name = {{ supervisord['slapgrid-cp'] }}
+numprocs = {{ supervisord['numprocs'] }}
+autostart = {{ supervisord['autostart'] }}
+exitcodes = {{ supervisord['exitcodes'] }}
+startretries = {{ supervisord['slapgrid-cp-startretries'] }}
+startsecs = {{ supervisord['startsecs'] }}
+autorestart = {{ supervisord['autorestart'] }}
+stdout_logfile = {{ supervisord['no_logfile'] }}
+stderr_logfile = {{ supervisord['no_logfile'] }}
+directory = {{ supervisord['directory'] }}
+environment = PATH="{{- supervisord['path'] -}}"
+
+[program:{{- supervisord['slapproxy'] -}}]
+command = {{ supervisord['slapproxy-command'] }}
+process_name = {{ supervisord['slapproxy'] }}
+numprocs = {{ supervisord['numprocs'] }}
+autostart = {{ supervisord['slapproxy-autostart'] }}
+startsecs = {{ supervisord['slapproxy-startsecs'] }}
+exitcodes = {{ supervisord['exitcodes'] }}
+autorestart = {{ supervisord['slapproxy-autorestart'] }}
+stdout_logfile = {{ supervisord['no_logfile'] }}
+stderr_logfile = {{ supervisord['no_logfile'] }}
+directory = {{ supervisord['directory'] }}
+environment = PATH="{{- supervisord['path'] -}}"
+
+[eventlistener:listener-slapgrid]
+command = {{ listener_slapgrid }}
+events = PROCESS_STATE_EXITED
+stdout_logfile = {{ supervisord['no_logfile'] }}
+stderr_logfile = {{ supervisord['stderr_logfile'] }}

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

@@ -56,61 +56,10 @@ recipe = zc.recipe.egg
 eggs = collective.recipe.template
 
 [versions]
-Jinja2 = 2.7.3
-MarkupSafe = 0.23
-Werkzeug = 0.9.6
-buildout-versions = 1.7
-cffi = 0.8.6
-cliff = 1.6.1
-cmd2 = 0.6.7
-cryptography = 0.5.2
-inotifyx = 0.2.0-1
-itsdangerous = 0.24
-lxml = 3.3.5
-meld3 = 1.0.0
-mr.developer = 1.30
-netaddr = 0.7.12
-netifaces = 0.10.4
-pyOpenSSL = 0.14
-pyparsing = 2.0.2
-pytz = 2014.4
-requests = 2.3.0
-six = 1.7.3
-slapos.cookbook = 0.87
-slapos.core = 1.1.2
-slapos.recipe.cmmi = 0.2
-slapos.recipe.template = 2.5
-stevedore = 0.15
-supervisor = 3.1.0
-xml-marshaller = 0.9.7
 collective.recipe.template = 1.11
 plone.recipe.command = 1.1
 slapos.recipe.build = 0.12
-
-# Required by:
-# slapos.core==1.1.2
-Flask = 0.10.1
-
-# Required by:
-# cliff==1.6.1
-argparse = 1.2.1
-
-# Required by:
-# slapos.cookbook==0.87
-lock-file = 2.0
-
-# Required by:
-# slapos.core==1.1.2
-psutil = 2.1.1
-
-# Required by:
-# cffi==0.8.6
-pycparser = 2.10
-
-# Required by:
-# slapos.core==1.1.2
-zope.interface = 4.1.1
-
+slapos.recipe.template = 2.5
 
 # Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
 [buildout]

software/unstable/MediaWiki/software.cfg

@@ -14,7 +14,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [mediawiki-patch]
 recipe = slapos.recipe.download

software/unstable/accords-xwiki/software.cfg

+[buildout]
+extends =
+  ../../stack/accords/buildout.cfg
+
+parts =
+  instance
+  instance-accords
+  accords
+  eggs
+  accords-manifest
+
+[accords-manifest]
+# Manifest for xwiki
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/xwiki.manifest.xml
+#md5sum = 3e1ea477d48080e9bdb98579f7f28be6

software/unstable/accords-xwiki/xwiki.manifest.xml

+<?xml version="1.0" encoding="UTF8"?>
+<manifest name="test2" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">
+
+	<description>test 1 : open stack small compute</description>
+
+	<node name="test2" type="simple" access="public" scope="normal" provider="openstack" >
+		<infrastructure name="test2">
+			<compute name="test2" architecture="x86" cores="1" memory="1G" speed="1G"/>
+			<storage name="test2" size="10G"/>
+			<network name="test2" label="ethernet" vlan="100M"/>
+		</infrastructure>
+		<image name="test2">
+			<system name="debian_with_cosacs"/>
+			<package
+				name="test2"
+				installation="mkdir /home/cosacs/vifib"
+				configuration="cp /home/cosacs/cosacs.xml /home/cosacs/vifib"
+				/>
+		</image>
+	</node>
+	<configuration name="test2">
+		<action name="test2_1" expression="test2.x='1';"/>
+		<action name="test2_2" expression="test2.y='2';"/>
+		<action name="test2_3" expression="test2.z='3';"/>
+	</configuration>
+	<interface name="test2"/>
+	<account name="slaposrecipe"/>
+	<security name="test2"/>
+</manifest>
\ No newline at end of file

software/unstable/b2evolution/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/cmsmadesimple/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/condor/software.cfg

@@ -45,137 +45,6 @@ md5sum = c512f495cdd112bceb04feab7c909a10
 [condor-application]
 list = {"condor_test":{"description-file":"${description-file:location}/${description-file:filename}", "executable":"${executable:location}/${executable:filename}", "executable-name":"${executable:filename}", "files":{}}}
 
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Alain Takoudjou
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJANlTfgX/9cX7MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-  BAMMBkNPTVAtMDAgFw0xMzA1MzAxMTUyMDhaGA8yMTEzMDUwNjExNTIwOFowETEP
-  MA0GA1UEAwwGQ09NUC0wMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSGtkh
-  UPOcYMRiL2czmdfeHNB34nXEr5fMpglbA9RO9Cakf6YhK0jU5Y7kzAb6ZlyEzcC+
-  YkYWQZ9WCLwGuUvThg5iYlnBxmksv5Ot+5DKyTL4hdMEPCQ0RaLcXSkbxk56q3Rn
-  EQdYL+IJXS1KGMRWbl4Ql3NhShM9q7vBgyoMuwIDAQABo1AwTjAdBgNVHQ4EFgQU
-  EpO2oyW/sFAS9eojDbYo3hEOOIIwHwYDVR0jBBgwFoAUEpO2oyW/sFAS9eojDbYo
-  3hEOOIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBP02wmekqmeD23
-  90NmwDwyEznDPEJDJybREtP+T++EJ1Q/rcnxIQ5a1iOEWY4RdH87H/+2O/7nDzGs
-  L0KzeG3WDdmnxLMQ5zpG9Qd5twC0GoMl1zf+8f9/t4QE7Dn4IosP3H3dkcRDQRch
-  SKYaJZHMckKx40/hhRsyFDR1Gj215g==
-  -----END CERTIFICATE-----
-  
 [versions]
 Jinja2 = 2.7
 MarkupSafe = 0.18

software/unstable/coppermine/software.cfg

@@ -11,7 +11,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/dotclear/software.cfg

@@ -11,7 +11,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/dotproject/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/eSKUeL/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/ezpublish/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg 
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/freeglobes/software.cfg

@@ -12,7 +12,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/freewebshop/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build

software/unstable/fusionnews/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build

software/gitrepo/software.cfg → software/unstable/gitrepo/software.cfg

@@ -4,10 +4,15 @@ extends =
   ../../component/apache/buildout.cfg
   ../../component/perl/buildout.cfg
   ../../component/git/buildout.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/ruby/buildout.cfg
+  ../../component/icu/buildout.cfg
   ../../stack/slapos.cfg
 
 parts =
   apache
+  nginx
+  ruby
   perl
   git
   gitweb
@@ -15,6 +20,8 @@ parts =
   template
   template-gitrepo
   collective-recipe-cmd
+  ruby-gems
+  python-eggs
 
 [template]
 recipe = slapos.recipe.template
@@ -60,6 +67,24 @@ recipe = zc.recipe.egg
 eggs =
   collective.recipe.cmd
 
+[ruby-gems]
+recipe = rubygemsrecipe
+ruby-executable = ${ruby:location}/bin/ruby
+gems =
+  charlock_holmes==0.6.8
+  bundler
+  rake
+  rails
+  railties
+gem-options = --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/
+environment =
+  LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib
+  CFLAGS = -I${icu:location}/include
+
+[python-eggs]
+recipe = zc.recipe.egg
+eggs =
+  pygments
 
 [version]
 slapos.cookbook = 0.64.2

software/unstable/guppy/software.cfg

@@ -11,7 +11,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/magento/software.cfg

@@ -10,7 +10,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/mantis/software.cfg

@@ -11,7 +11,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/mioga/software.cfg → software/unstable/mioga/software.cfg

@@ -180,34 +180,3 @@ url = ${:_profile_base_location_}/instance-postgres.cfg
 # md5sum = 
 output = ${buildout:directory}/template-postgres.cfg
 mode = 0644
-
-[networkcache]
-# Cedric de Saint Martin signature certificate
-# Test agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----

software/unstable/moregroupware/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/net2ftp/software.cfg

@@ -12,7 +12,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/nucleus/software.cfg

@@ -12,7 +12,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/openX/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/openemr/software.cfg

@@ -12,7 +12,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/os-commerce/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg 
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/phpbb/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/phpmyadmin/software.cfg

@@ -10,7 +10,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
   
 [template]
 # Default template for the instance.

software/unstable/phpmybackup/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build

software/unstable/phpnuke/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/phprojekt/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build

software/unstable/pimcore/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/piwigo/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/piwik/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 
 [application]

software/unstable/prestashop/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/punbb/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/quick-cart/software.cfg

@@ -11,7 +11,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/quick-cms/software.cfg

@@ -11,7 +11,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/reverse-proxy-nginx/instance.cfg.in

@@ -72,7 +72,7 @@ logrotate-backup = $${:backup}/logrotate
 # Deploy nginx and publish connection parameters inside of the recipe
 [reverse-proxy]
 recipe = slapos.cookbook:reverseproxy.nginx
-nginx-executable = ${nginx-unstable:location}/sbin/nginx
+nginx-executable = ${nginx:location}/sbin/nginx
 wrapper = $${directory:bin}/nginx
 
 configuration-file = $${directory:nginx-configuration}/nginx.conf

software/unstable/simpleMachineForum/software.cfg

@@ -12,7 +12,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/spip/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg 
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/statusnet/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/sugar-crm/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/thelia/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/tiki/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/trac-svn/software.cfg → software/unstable/trac-svn/software.cfg

@@ -166,171 +166,23 @@ stop-on-error = true
 update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Alain Takoudjou
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJANlTfgX/9cX7MA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-  BAMMBkNPTVAtMDAgFw0xMzA1MzAxMTUyMDhaGA8yMTEzMDUwNjExNTIwOFowETEP
-  MA0GA1UEAwwGQ09NUC0wMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSGtkh
-  UPOcYMRiL2czmdfeHNB34nXEr5fMpglbA9RO9Cakf6YhK0jU5Y7kzAb6ZlyEzcC+
-  YkYWQZ9WCLwGuUvThg5iYlnBxmksv5Ot+5DKyTL4hdMEPCQ0RaLcXSkbxk56q3Rn
-  EQdYL+IJXS1KGMRWbl4Ql3NhShM9q7vBgyoMuwIDAQABo1AwTjAdBgNVHQ4EFgQU
-  EpO2oyW/sFAS9eojDbYo3hEOOIIwHwYDVR0jBBgwFoAUEpO2oyW/sFAS9eojDbYo
-  3hEOOIIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBP02wmekqmeD23
-  90NmwDwyEznDPEJDJybREtP+T++EJ1Q/rcnxIQ5a1iOEWY4RdH87H/+2O/7nDzGs
-  L0KzeG3WDdmnxLMQ5zpG9Qd5twC0GoMl1zf+8f9/t4QE7Dn4IosP3H3dkcRDQRch
-  SKYaJZHMckKx40/hhRsyFDR1Gj215g==
-  -----END CERTIFICATE-----
-
 [versions]
-#Error: Couldn't install: lxml 3.1.2
-lxml = 3.1.1
-lock-file = 2.0
 Genshi = 0.7
-Jinja2 = 2.6
 MySQL-python = 1.2.4
 Pygments = 1.6
 Trac = 1.0.1
-Werkzeug = 0.8.3
 apache-libcloud = 0.12.4
 async = 0.6.1
-buildout-versions = 1.7
 collective.recipe.cmd = 0.6
 docutils = 0.10
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 2.0
-slapos.recipe.cmmi = 0.1.1
-inotifyx = 0.2.0
-meld3 = 0.6.10
-netaddr = 0.7.10
 plone.recipe.command = 1.1
 pycrypto = 2.6
-pytz = 2013b
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.34.0
 smmap = 0.8.2
 z3c.recipe.scripts = 1.0.1
-slapos.cookbook = 0.78.1
-
-# Required by:
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-Flask = 0.9
 
 # Required by:
 # slapos.toolbox==0.34.0
@@ -344,38 +196,6 @@ atomize = 0.1.1
 # slapos.toolbox==0.34.0
 feedparser = 5.1.3
 
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
 # Required by:
 # slapos.toolbox==0.34.0
 paramiko = 1.10.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-psutil = 0.7.0
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5

software/unstable/ultimate-php-borad/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = hexagonit.recipe.download

software/unstable/xoops/software.cfg

@@ -11,7 +11,6 @@ parts =
   
 extends =
   ../../stack/lamp.cfg 
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/xwiki/software.cfg

@@ -24,40 +24,6 @@ recipe = hexagonit.recipe.download
 url = http://download.forge.objectweb.org/xwiki/xwiki-enterprise-web-2.7.war
 md5sum = c56e2cde96d28c5899a16a8270b6ff88
 
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Cedric de Saint Martin
-#   Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
-
 [versions]
 slapos.cookbook = 0.18
 

software/unstable/zencart/software.cfg

@@ -12,7 +12,6 @@ parts =
 
 extends =
   ../../stack/lamp.cfg
-  ../../stack/shacache-client.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked

software/unstable/zimbra-kvm/software.cfg

 [buildout]
 extends = common.cfg
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Cedric de Saint Martin
-#   Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
-
 [versions]
 numpy = 1.6.2
 Jinja2 = 2.6

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

@@ -15,7 +15,7 @@
       "type": "string"
     },
     "web-checker": {
-      "description": "Controls automated cache checker, disabled if null or empty"
+      "description": "Controls automated cache checker, disabled if null or empty",
       "properties": {
         "frontend-url": {
           "description": "Override entry-point-url web checker will check the HTTP headers of all links in the web site, '%(ip)s' and '%(port)s' being substituted with varnish's listening ip and port, respectively",

software/varnish/software.cfg

@@ -3,12 +3,6 @@
 develop =
   ${:parts-directory}/slapos.cookbook-repository
 
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-    http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-
 extends =
   ../../stack/slapos.cfg
   ../../component/dash/buildout.cfg
@@ -106,136 +100,5 @@ scripts =
   killpidfromfile
 
 [versions]
-erp5.util = 0.4.34
-lxml = 2.3.6
-slapos.toolbox = 0.33.1
-
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-#   Aurélien Calonne
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
-  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
-  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
-  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
-  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
-  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
-  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
-  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
-  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
-  -----END CERTIFICATE-----
+erp5.util = 0.4.41
+slapos.toolbox = 0.40.2

software/zabbix-agent/software.cfg

@@ -18,74 +18,5 @@ md5sum = 98a680fe8fddce5dcee455e65c228fde
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Cedric de Saint Martin
-#   Test Agent
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
 [versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
-buildout-versions = 1.7
-inotifyx = 0.2.0-1
-lxml = 3.2.0
-meld3 = 0.6.10
-netaddr = 0.7.10
-pytz = 2013b
-slapos.cookbook = 0.78.0
-slapos.core = 0.35.1
-slapos.recipe.cmmi = 0.1
 slapos.recipe.template = 2.4.2
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-Flask = 0.9
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.2
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
-

stack/accords/buildout.cfg

+[buildout]
+
+extends =
+  ../../component/accords/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../slapos.cfg
+
+parts =
+  instance
+  instance-accords
+  accords
+  eggs
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+
+# If we use only one software type in the future, delete duplication of template
+[instance]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+#md5sum = 3e1ea477d48080e9bdb98579f7f28be6
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[instance-accords]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-accords.cfg
+#md5sum = 737a6d2f1ea9938b8d76e2d35e18e482
+output = ${buildout:directory}/template-accords.cfg
+mode = 0644
+
+[networkcache]
+# Cedric de Saint Martin signature certificate
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----

stack/accords/instance-accords.cfg

+[buildout]
+parts =
+  copy-scripts
+  accords-instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+#[url]
+#recipe = slapos.cookbook:publishurl
+#url =
+
+[accords-instance]
+recipe = slapos.cookbook:accords
+
+# Options
+userid = cedric.de
+domain = domain
+tenantname = vifib
+#userid = $${slap-parameter:userid}
+password = $${slap-parameter:password}
+#domain = $${slap-parameter:domain}
+#tenantname = $${slap-parameter:tenantname}
+openstack_url = http://beta.enocloud.com:5000/v2.0/
+os-config = $${accordsdirectory:accords}/os_config.xml
+listen-ip = $${slap-network-information:local-ipv4}
+
+# Paths
+accords-configuration-file = $${accordsdirectory:accords}/accords.ini
+manifest-source = ${accords-manifest:target}
+manifest-destination = $${accordsdirectory:accords}/manifest.xml
+manifest-name = manifest
+accords-wrapper = $${basedirectory:services}/accords
+testos-wrapper = $${rootdirectory:bin}/testos
+# Workaround
+accords_lib_directory : ${accords:location}/lib
+accords_bin_directory : ${accords:location}/bin
+
+[rootdirectory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc/
+var = $${buildout:directory}/var/
+srv = $${buildout:directory}/srv/
+bin = $${buildout:directory}/bin/
+
+[basedirectory]
+recipe = slapos.cookbook:mkdirectory
+log = $${rootdirectory:var}/log/
+services = $${rootdirectory:etc}/run/
+run = $${rootdirectory:var}/run/
+backup = $${rootdirectory:srv}/backup/
+
+[accordsdirectory]
+recipe = slapos.cookbook:mkdirectory
+accords = $${rootdirectory:srv}/accords
+rest = $${accordsdirectory:accords}/rest
+service = $${accordsdirectory:accords}/service
+security = $${accordsdirectory:accords}/security
+
+[copy-scripts]
+recipe = slapos.cookbook:copyfilelist
+target-directory = $${accordsdirectory:accords}
+file-list =
+  ${accords-scripts:location}/scripts/accords
+  ${accords-scripts:location}/scripts/accords-config
+  ${accords-scripts:location}/scripts/co-broker
+  ${accords-scripts:location}/scripts/co-check
+  ${accords-scripts:location}/scripts/co-command
+  ${accords-scripts:location}/scripts/co-parser
+  ${accords-scripts:location}/scripts/co-platform
+  ${accords-scripts:location}/scripts/co-provider
+  ${accords-scripts:location}/scripts/co-provision
+  ${accords-scripts:location}/scripts/co-resolver
+  ${accords-scripts:location}/scripts/co-start
+  ${accords-scripts:location}/scripts/co-status
+  ${accords-scripts:location}/scripts/co-stop
+  ${accords-scripts:location}/scripts/run-azprocci
+  ${accords-scripts:location}/scripts/run-broker
+  ${accords-scripts:location}/scripts/run-coees
+  ${accords-scripts:location}/scripts/run-coips
+  ${accords-scripts:location}/scripts/run-comons
+  ${accords-scripts:location}/scripts/run-conagios
+  ${accords-scripts:location}/scripts/run-conets
+  ${accords-scripts:location}/scripts/run-coobas
+  ${accords-scripts:location}/scripts/run-cool
+  ${accords-scripts:location}/scripts/run-copaas
+  ${accords-scripts:location}/scripts/run-cops
+  ${accords-scripts:location}/scripts/run-cosacs
+  ${accords-scripts:location}/scripts/run-cosched
+  ${accords-scripts:location}/scripts/run-coss
+  ${accords-scripts:location}/scripts/run-dcprocci
+  ${accords-scripts:location}/scripts/run-ezvm
+  ${accords-scripts:location}/scripts/run-fileserver
+  ${accords-scripts:location}/scripts/run-jpaasprocci
+  ${accords-scripts:location}/scripts/run-onprocci
+  ${accords-scripts:location}/scripts/run-osocciprocci
+  ${accords-scripts:location}/scripts/run-osprocci
+  ${accords-scripts:location}/scripts/run-paasprocci
+  ${accords-scripts:location}/scripts/run-paprocci
+  ${accords-scripts:location}/scripts/run-parser
+  ${accords-scripts:location}/scripts/run-procci
+  ${accords-scripts:location}/scripts/run-publisher
+  ${accords-scripts:location}/scripts/openssl.cnf
+  ${accords-scripts:location}/scripts/run-slam

stack/accords/instance.cfg

+[buildout]
+
+parts =
+  switch-softwaretype
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${instance-accords:output}

stack/boinc/buildout.cfg

@@ -62,199 +62,30 @@ platform = x86_64-pc-linux-gnu
 [boinc-application]
 app-list = {}
 
-[networkcache]
-# signature certificates of the following uploaders.
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent (Automatic update from tests)
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-
 [versions]
 pycrypto = 2.6
-lxml = 3.2.1
-
-Jinja2 = 2.7
-MarkupSafe = 0.18
 MySQL-python = 1.2.4
-Werkzeug = 0.8.3
 apache-libcloud = 0.12.4
 async = 0.6.1
-buildout-versions = 1.7
 gitdb = 0.5.4
-inotifyx = 0.2.0-1
-meld3 = 0.6.10
-netaddr = 0.7.10
 plone.recipe.command = 1.1
-pytz = 2013b
-slapos.recipe.cmmi = 0.1.1
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.34.0
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
-slapos.cookbook=0.78.1
-
-# Required by:
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
-# slapos.cookbook==0.78.1
-lock-file = 2.0
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.toolbox==0.34.0
-paramiko = 1.10.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-psutil = 0.7.1
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.7.2
-
-# Required by:
-# slapos.toolbox==0.34.0
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
\ No newline at end of file
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

stack/cloudooo.cfg

 [buildout]
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-    http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-    http://www.owlfish.com/software/wsgiutils/download.html
+find-links +=
+  http://www.owlfish.com/software/wsgiutils/download.html
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -12,6 +8,7 @@ include-site-packages = false
 exec-sitecustomize = false
 
 extends =
+  ../stack/slapos.cfg
   ../component/cups/buildout.cfg
   ../component/dbus/buildout.cfg
   ../component/glib/buildout.cfg
@@ -69,11 +66,9 @@ parts =
 
   rdiff-backup
   haproxy
+  cloudooo-develop
   cloudooo
 
-# Local development
-develop +=
-  ${:parts-directory}/cloudooo
 
 [versions]
 Paste = 1.7.5.1

stack/erp5/buildout.cfg

 [buildout]
-# Local development
-develop =
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/cloudooo-repository
-
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
-    http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-    http://www.owlfish.com/software/wsgiutils/download.html
-
-allow-hosts += pybrary.net
+find-links +=
+  http://www.owlfish.com/software/wsgiutils/download.html
 
 extends =
 # Exact version of Zope
@@ -42,7 +31,7 @@ extends =
   ../../component/mariadb/buildout.cfg
   ../../component/mysql-python/buildout.cfg
   ../../component/patch/buildout.cfg
-  ../../component/pil-python/buildout.cfg
+  ../../component/pillow/buildout.cfg
   ../../component/pycrypto-python/buildout.cfg
   ../../component/pysvn-python/buildout.cfg
   ../../component/python-2.7/buildout.cfg
@@ -71,6 +60,9 @@ extends =
   ../../component/pycurl/buildout.cfg
 
 parts =
+  erp5-util-develop
+  slapos-cookbook-develop
+  slapos-cookbook
   rdiff-backup
   aspell
   aspell-en-dictionary
@@ -127,22 +119,17 @@ parts =
   android-fonts
 
 # Cloudooo specific part
+  cloudooo-develop
   cloudooo
 
 # get git repositories
   erp5
   genbt5list
 
-# fix products path (Zeo needs ERP5 Products to be available for
-# conflict resolution)
-  fix-products-paths
 # some additional utils
   slapos-toolbox
   zodbanalyze
 
-# Local development
-  slapos.cookbook-repository
-  check-recipe
 # Create instance template
   template
 
@@ -151,19 +138,6 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 mode = 644
 
-# Local development
-[slapos.cookbook-repository]
-recipe = slapos.recipe.build:gitclone
-repository = http://git.erp5.org/repos/slapos.git
-branch = erp5-cluster
-git-executable = ${git:location}/bin/git
-
-[check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
 [template-jinja2-base]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}.in
@@ -423,14 +397,6 @@ repository = http://git.erp5.org/repos/erp5.git
 branch = master
 git-executable = ${git:location}/bin/git
 
-[fix-products-paths]
-recipe = plone.recipe.command
-stop-on-error = true
-dir = ${erp5:location}
-command =
-  rm -f "${:dir}/Products" && ln -s product "${:dir}/Products" && touch "${:dir}/product/__init__.py"
-update-command = ${:command}
-
 [testrunner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not
 #      expose entry point for test runner
@@ -509,7 +475,7 @@ recipe = zc.recipe.egg
 eggs =
   ${mysql-python:egg}
   ${lxml-python:egg}
-  ${pil-python:egg}
+  ${pillow-python:egg}
   ${python-ldap-python:egg}
   ${pysvn-python:egg}
   ${pycrypto-python:egg}
@@ -627,10 +593,18 @@ entry-points =
   zodbanalyze=erp5.util.zodbanalyze:main
 scripts = zodbanalyze
 
+# develop erp5.util from parts/erp5/
+[erp5-util-develop]
+recipe = zc.recipe.egg:develop
+setup = ${erp5:location}
+
 [cloudooo-repository]
 branch =
 revision = f67af2797f74d4212f7221978645552353f341c8
 
+[slapos.cookbook-repository]
+branch = erp5-cluster
+
 [slapos-toolbox]
 recipe = zc.recipe.egg
 eggs =
@@ -657,9 +631,6 @@ PasteDeploy = 1.5.2
 Pygments = 1.6
 coverage = 3.7.1
 
-# huBarcode 1.0.0 has an issue with importing PIL.
-huBarcode = 0.63
-
 # Known version with works
 numpy = 1.6.2
 
@@ -676,9 +647,6 @@ rdiff-backup = 1.0.5
 # use newest version of slapos.cookbook
 slapos.cookbook =
 
-# we need to define an explicit version of slapos.core that is propagated to instances
-slapos.core = 1.1.3
-
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001
 
@@ -700,13 +668,12 @@ zope.app.testing = 3.8.1
 
 # Pinned versions
 MySQL-python = 1.2.5
-PIL = 1.1.7
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 Products.ExternalEditor = 1.1.0
 Products.GenericSetup = 1.7.4
 Products.LongRequestLogger = 1.1.0
-Products.MimetypesRegistry = 2.0.5
+Products.MimetypesRegistry = 2.0.6
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.9
 PyPDF2 = 1.23
@@ -715,42 +682,44 @@ Pympler = 0.3.1
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 apache-libcloud = 0.15.1
-astroid = 1.2.0
+astroid = 1.2.1
 async = 0.6.1
 chardet = 2.2.1
 csp-eventlet = 0.7.0
+ecdsa = 0.11
 elementtree = 1.2.7-20070827-preview
 erp5diff = 0.8.1.5
-eventlet = 0.15.0
+eventlet = 0.15.2
 five.formlib = 1.0.4
 five.localsitemanager = 2.0.5
 gitdb = 0.5.4
-greenlet = 0.4.3
+greenlet = 0.4.4
 http-parser = 0.8.3
 httplib2 = 0.9
+huBarcode = 1.0.0
 interval = 1.0.0
 ipdb = 0.8
 ipython = 2.2.0
 logilab-common = 0.62.1
 minitage.paste = 1.4.6
 minitage.recipe.egg = 1.107
+pillow = 2.5.3
 plone.recipe.command = 1.1
 ply = 3.4
-polib = 1.0.4
+polib = 1.0.5
 pprofile = 1.7.2
 pycountry = 1.8
 pyflakes = 0.8.1
-pylint = 1.3.0
+pylint = 1.3.1
 python-ldap = 2.4.15
 python-magic = 0.4.6
 python-memcached = 1.53
-pytz = 2014.4
 qrcode = 5.0.1
 restkit = 4.2.2
 rtjp-eventlet = 0.3.2
 slapos.recipe.build = 0.12
 slapos.recipe.template = 2.5
-slapos.toolbox = 0.39.4
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 socketpool = 0.5.3
 spyne = 2.11.0
@@ -764,7 +733,7 @@ xupdate-processor = 0.4
 xfw = 0.10
 
 # Required by:
-# slapos.toolbox==0.39.4
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
@@ -772,19 +741,15 @@ GitPython = 0.3.2.RC1
 Products.ZSQLMethods = 2.13.4
 
 # Required by:
-# slapos.toolbox==0.39.4
+# slapos.toolbox==0.40.2
 atomize = 0.2.0
 
-# Required by:
-# paramiko==1.14.0
-ecdsa = 0.11
-
 # Required by:
 # cloudooo==1.2.5-dev
 erp5.util = 0.4.41
 
 # Required by:
-# slapos.toolbox==0.39.4
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
@@ -813,8 +778,8 @@ minitage.recipe.common = 1.90
 ordereddict = 1.1
 
 # Required by:
-# slapos.toolbox==0.39.4
-paramiko = 1.14.0
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1
 
 # Required by:
 # zope.app.testing==3.8.1

stack/lamp.cfg

@@ -37,148 +37,31 @@ eggs =
 [mariadb]
 keep-compile-dir = false
 
-[networkcache]
-# Romain Courteaud + Sebastien Robin + Alain Takoudjou
-# + Cedric de Saint Martin signature certificate
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
-  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
-  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
-  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
-  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
-  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
-  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
-  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
-  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
-  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-
 [versions]
 # Generated automatically by buildout-versions
-Jinja2 = 2.6
 MySQL-python = 1.2.3
-Werkzeug = 0.8.3
 apache-libcloud = 0.9.1
 async = 0.6.1
-buildout-versions = 1.7
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
 plone.recipe.command = 1.1
-slapos.cookbook = 0.45
 slapos.recipe.build = 0.7
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.3
-slapos.toolbox = 0.23
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.24
-# slapos.toolbox==0.23
-Flask = 0.8
-
-# Required by:
-# slapos.toolbox==0.23
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.45
-PyXML = 0.8.4
-
-# Required by:
-# slapos.toolbox==0.23
+# slapos.toolbox==0.40.2
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.23
+# slapos.toolbox==0.40.2
 feedparser = 5.1.1
 
 # Required by:
-# slapos.cookbook==0.45
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.45
-# slapos.core==0.24
-# slapos.toolbox==0.23
-# xml-marshaller==0.9.7
-lxml = 2.3.4
-
-# Required by:
-# slapos.cookbook==0.45
-netaddr = 0.7.6
-
-# Required by:
-# slapos.core==0.24
-netifaces = 0.10.4
-
-# Required by:
-# slapos.toolbox==0.23
-paramiko = 1.7.7.1
-
-# Required by:
-# slapos.toolbox==0.23
-psutil = 0.4.1
-
-# Required by:
-# slapos.cookbook==0.45
-# slapos.toolbox==0.23
-slapos.core = 0.24
-
-# Required by:
-# slapos.core==0.24
-supervisor = 3.0a12
-
-# Required by:
-# slapos.cookbook==0.45
-# slapos.toolbox==0.23
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.45
-zc.recipe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.24
-zope.interface = 3.8.0
\ No newline at end of file
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

stack/lamp/buildout.cfg

@@ -178,211 +178,31 @@ eggs =
   ${lxml-python:egg}
   slapos.toolbox[lampconfigure]
 
-[networkcache]
-# Romain Courteaud + Sebastien Robin + Alain Takoudjou
-# + Cedric de Saint Martin signature certificate
-# List of signatures of uploaders we trust:
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent Signature
-#   Alain Takoudjou
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
-  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
-  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
-  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
-  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
-  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
-  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
-  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
-  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
-  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
-  -----END CERTIFICATE-----
-
 [versions]
-Jinja2 = 2.6
 MySQL-python = 1.2.4
-Werkzeug = 0.8.3
 apache-libcloud = 0.12.3
 async = 0.6.1
-buildout-versions = 1.7
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.6
-inotifyx = 0.2.0
-lxml = 3.1.1
-meld3 = 0.6.10
-netaddr = 0.7.10
 pycrypto = 2.6
-pytz = 2013b
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.78.0
 slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.34.0
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-Flask = 0.9
-
-# Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.34.0
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.toolbox==0.34.0
-paramiko = 1.10.0
-
-# Required by:
-# slapos.toolbox==0.34.0
-psutil = 0.6.1
-
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.6.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.toolbox==0.34.0
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.core==0.35.1
-zope.interface = 4.0.5
-
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1

stack/lapp/buildout.cfg

@@ -175,241 +175,44 @@ eggs =
   ${psycopg2:egg}
   slapos.toolbox
 
-[networkcache]
-# Romain Courteaud + Sebastien Robin + Alain Takoudjou
-# + Cedric de Saint Martin signature certificate
-# List of signatures of uploaders we trust:
-#   Romain Courteaud
-#   Sebastien Robin
-#   Kazuhiko Shiozaki
-#   Cedric de Saint Martin
-#   Yingjie Xu
-#   Gabriel Monnerat
-#   Łukasz Nowak
-#   Test Agent Signature
-#   Alain Takoudjou
-signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
-  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
-  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
-  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
-  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
-  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
-  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
-  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
-  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
-  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
-  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
-  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
-  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
-  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
-  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
-  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
-  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
-  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
-  vaZhjNYKWQf79l6zXfOvphzJ
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
-  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
-  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
-  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
-  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
-  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
-  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
-  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
-  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
-  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
-  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
-  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
-  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
-  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
-  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
-  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
-  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
-  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
-  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
-  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
-  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
-  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
-  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
-  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
-  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
-  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
-  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
-  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
-  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
-  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
-  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
-  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
-  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
-  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
-  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
-  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
-  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
-  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
-  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
-  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
-  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
-  -----END CERTIFICATE-----
-  -----BEGIN CERTIFICATE-----
-  MIIB9DCCAV2gAwIBAgIJAL392bEdqpFQMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-  BAMMCENPTVAtMjM0MB4XDTExMTEwOTE1MzA0M1oXDTEyMTEwODE1MzA0M1owEzER
-  MA8GA1UEAwwIQ09NUC0yMzQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRR
-  T0cacZKztie/DaRRjq3mgcqfPKoGXu6zXmeRQI+6Y4bnzjf8h/jAuPzR552P0xK5
-  psxhavXA8hOGRLFDtvDMQLepVHWfwqtFtcp5vNf2+KWqOYy0OxHfVIlnatvCqTZN
-  NG1vRsSOAQ+v7QNFHh6NBbiSrjBBfg4vkfzqnsUvAgMBAAGjUDBOMB0GA1UdDgQW
-  BBTGGw+ASoDi9kqPElDkC0Q5RtAfRjAfBgNVHSMEGDAWgBTGGw+ASoDi9kqPElDk
-  C0Q5RtAfRjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIOuR1OqXLke
-  LLzH0kRnlIOe60dYJvRya53wDx5x2g4/qkXZPLx2RcbaUrX/SCbL70vfr+apUPss
-  dOSJ86sf/PQHW3/1fhTTE+Vck1MiiAq0aIx6WnKnz4+ZcQctB7b0DCsTcQnmbpi2
-  n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
-  -----END CERTIFICATE-----
-
-
 [versions]
-Jinja2 = 2.6
-Werkzeug = 0.8.3
 apache-libcloud = 0.12.1
 async = 0.6.1
-buildout-versions = 1.7
 cp.recipe.cmd = 0.4
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.6
-meld3 = 0.6.10
 plone.recipe.command = 1.1
 pycrypto = 2.6
 rdiff-backup = 1.0.5
 slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.33.1
+slapos.toolbox = 0.40.2
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.35.1
-# slapos.toolbox==0.33.1
-Flask = 0.9
-
-# Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.40.2
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.40.2
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.33.1
+# slapos.toolbox==0.40.2
 feedparser = 5.1.3
 
 # Required by:
-# slapos.cookbook==0.74.1-dev
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.74.1-dev
-# slapos.core==0.35.1
-# xml-marshaller==0.9.7
-lxml = 3.1.0
-
-# Required by:
-# slapos.cookbook==0.74.1-dev
-netaddr = 0.7.10
-
-# Required by:
-# slapos.core==0.35.1
-netifaces = 0.10.4
-
-# Required by:
-# slapos.toolbox==0.33.1
-paramiko = 1.10.0
-
-# Required by:
-# slapos.toolbox==0.33.1
-psutil = 0.6.1
+# slapos.toolbox==0.40.2
+paramiko = 1.15.1
 
 # Required by:
 # slapos.recipe.maarch==0.4
 psycopg2 = 2.4.6
 
-# Required by:
-# slapos.core==0.35.1
-pyflakes = 0.6.1
-
-# Required by:
-# slapos.cookbook==0.74.1-dev
-pytz = 2013b
-
-# Required by:
-# slapos.cookbook==0.74.1-dev
-# slapos.toolbox==0.33.1
-slapos.core = 0.35.1
-
-# Required by:
-# slapos.core==0.35.1
-supervisor = 3.0b1
-
-# Required by:
-# slapos.core==0.35.1
-unittest2 = 0.5.1
-
-# Required by:
-# slapos.cookbook==0.74.1-dev
-# slapos.toolbox==0.33.1
-xml-marshaller = 0.9.7
-
 # Required by:
 # zope.testing==4.1.2
 zope.exceptions = 4.0.6
 
-# Required by:
-# slapos.core==0.35.1
-# zope.testing==4.1.2
-zope.interface = 4.0.5
-
 # Required by:
 # cp.recipe.cmd==0.4
 zope.testing = 4.1.2
-

stack/monitor/buildout.cfg

@@ -66,7 +66,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
 md5sum = e759977b21c70213daa4c2701f2c2078
-destination = ${buildout:directory}/parts/monitor-index
+destination = ${buildout:parts-directory}/monitor-index
 filename = index.cgi.in
 mode = 0644
 
@@ -74,7 +74,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
-destination = ${buildout:directory}/parts/monitor-template-index
+destination = ${buildout:parts-directory}/monitor-template-index
 md5sum = 7400c8cfa16a15a0d41f512b8bbb1581
 filename = index.html.jinja2
 mode = 0644
@@ -84,7 +84,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
 md5sum = e43d79bec8824265e22df7960744113a
-destination = ${buildout:directory}/parts/monitor-template-status-cgi
+destination = ${buildout:parts-directory}/monitor-template-status-cgi
 filename = status.cgi.in
 mode = 0644
 
@@ -93,7 +93,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
 #md5sum = 4fb26753ee669b8ac90ffe33dbd12e8f
-destination = ${buildout:directory}/parts/monitor-template-status-history-cgi
+destination = ${buildout:parts-directory}/monitor-template-status-history-cgi
 filename = status-history.cgi.in
 mode = 0644
 
@@ -102,7 +102,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
 md5sum = b4cef123a3273e848e8fe496e22b20a8
-destination = ${buildout:directory}/parts/monitor-template-settings-cgi
+destination = ${buildout:parts-directory}/monitor-template-settings-cgi
 filename = settings.cgi.in
 mode = 0644
 
@@ -111,7 +111,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/webfile-directory/${:filename}
 download-only = true
 md5sum = c7ba7ecb09d0d1d24e7cb73a212cc33f
-destination = ${buildout:directory}/parts/monitor-template-monitor-password-cgi
+destination = ${buildout:parts-directory}/monitor-template-monitor-password-cgi
 filename = monitor-password.cgi.in
 mode = 0644
 
@@ -120,7 +120,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
 md5sum = 5f1b93ccdea7c3031aef396154c64938
-destination = ${buildout:directory}/parts/monitor-template-rss-bin
+destination = ${buildout:parts-directory}/monitor-template-rss-bin
 filename = status2rss.py
 mode = 0644
 
@@ -136,7 +136,7 @@ recipe = hexagonit.recipe.download
 url = http://git.erp5.org/gitweb/slapos.git/snapshot/930be99041ea26b7b1186830e5eb56ef0acc1bdf.tar.gz
 download-only = false
 filename = monitor-static.tar.gz
-destination = ${buildout:directory}/parts/monitor-static-files
+destination = ${buildout:parts-directory}/monitor-static-files
 ignore-existing = true
 strip-top-level-dir = true
 mode = 0644

stack/slapos.cfg

@@ -6,6 +6,8 @@ python = python2.7
 
 # Developers need to add explicitely this part in their software profile
 # parts = slapos-cookbook
+# Note that if you want a develop version of slapos-cookbook from a git
+# checkout, you must add both slapos-cookbook-develop and slapos-cookbook in parts
 
 # Explicitly disable download-cache
 download-cache =
@@ -29,9 +31,10 @@ exec-sitecustomize = false
 
 # Add location for modified non-official slapos.buildout
 find-links +=
-  http://www.nexedi.org/static/packages/source/slapos.buildout/
+  http://dist.repoze.org
   http://www.nexedi.org/static/packages/source/
   http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 # Use only quite well working sites.
 allow-hosts +=
@@ -41,6 +44,7 @@ allow-hosts +=
   *.sourceforge.net
   alastairs-place.net
   bitbucket.org
+  code.google.com
   dist.repoze.org
   effbot.org
   github.com
@@ -61,9 +65,19 @@ versions = versions
 # Define networkcache with shacache.org
 networkcache-section = networkcache
 
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = master
+git-executable = ${git:location}/bin/git
+
+[slapos-cookbook-develop]
+recipe = zc.recipe.egg:develop
+setup = ${slapos.cookbook-repository:location}
+
 # Install slapos.cookbook containing all officials recipes
 # Explicitely define dependencies as well, because of buildout limitation
-# if using "develop"
+# if using "develop". XXX really ?
 [slapos-cookbook]
 recipe = zc.recipe.egg
 eggs =
@@ -85,69 +99,248 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-013
-# zc.recipe.egg 2.x is for Buildout 2
-zc.recipe.egg = 1.3.2
+zc.buildout = 1.7.1-dev-SlapOS-003
+# Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
+zc.recipe.egg = 1.3.2nxd001
 # Use own version of h.r.download to be able to open xz-like archives
 hexagonit.recipe.download = 1.7nxd002
-# Use pinned version of setuptools. Other versions work, but changing
-# version makes buildout recompile everything. Developers' nightmare.
-setuptools = 5.5.1
-# Official egg of prettytable has permission problems in EGG-INFO.
-prettytable = 0.7.3-nxd001
 
 Jinja2 = 2.7.3
 MarkupSafe = 0.23
 Werkzeug = 0.9.6
 buildout-versions = 1.7
 cffi = 0.8.6
-cliff = 1.6.1
 cmd2 = 0.6.7
-cryptography = 0.5.3
-inotifyx = 0.2.0-1
+cryptography = 0.5.4
 itsdangerous = 0.24
-lxml = 3.3.5
+lxml = 3.4.0
 meld3 = 1.0.0
 mr.developer = 1.30
-netaddr = 0.7.12
-netifaces = 0.10.4
+prettytable = 0.7.2
 pyOpenSSL = 0.14
 pyparsing = 2.0.2
-pytz = 2014.4
-requests = 2.3.0
-six = 1.7.3
+setuptools = 5.8
+six = 1.8.0
 slapos.cookbook = 0.87
-slapos.core = 1.1.3
+slapos.core = 1.2.4
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.cmmi = 0.2
-stevedore = 0.15
-supervisor = 3.1.1
-xml-marshaller = 0.9.7
+stevedore = 1.0.0
 
 # Required by:
-# slapos.core==1.1.3
+# slapos.core==1.2.4
 Flask = 0.10.1
 
 # Required by:
-# cliff==1.6.1
+# cliff==1.7.0
+# stevedore==1.0.0
 argparse = 1.2.1
 
+# Required by:
+# slapos.core==1.2.4
+cliff = 1.7.0
+
+# Required by:
+# slapos.cookbook==0.87
+inotifyx = 0.2.2
+
 # Required by:
 # slapos.cookbook==0.87
 lock-file = 2.0
 
 # Required by:
-# slapos.core==1.1.3
-psutil = 2.1.1
+# slapos.cookbook==0.87
+netaddr = 0.7.12
+
+# Required by:
+# slapos.core==1.2.4
+netifaces = 0.10.4
+
+# Required by:
+# slapos.core==1.2.4
+psutil = 2.1.2
 
 # Required by:
 # cffi==0.8.6
 pycparser = 2.10
 
 # Required by:
-# slapos.core==1.1.3
+# slapos.cookbook==0.87
+pytz = 2014.7
+
+# Required by:
+# slapos.core==1.2.4
+requests = 2.4.1
+
+# Required by:
+# slapos.core==1.2.4
+supervisor = 3.1.2
+
+# Required by:
+# slapos.cookbook==0.87
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==1.2.4
 zope.interface = 4.1.1
 
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache
 download-dir-url = http://www.shacache.org/shadir
+
+# signature certificates of the following uploaders.
+#   Romain Courteaud
+#   Sebastien Robin
+#   Kazuhiko Shiozaki
+#   Cedric de Saint Martin
+#   Yingjie Xu
+#   Gabriel Monnerat
+#   Łukasz Nowak
+#   Test Agent (Automatic update from tests)
+#   Aurélien Calonne
+#   Rafael Monnerat
+#   Antoine Catton
+signature-certificate-list =
+  -----BEGIN CERTIFICATE-----
+  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
+  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
+  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
+  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
+  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
+  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
+  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
+  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
+  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
+  QUUGLQ==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+  BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
+  DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
+  YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
+  XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
+  L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
+  /4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
+  LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
+  FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
+  R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
+  hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
+  BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
+  BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
+  vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
+  3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
+  67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
+  RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
+  PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
+  z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
+  KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
+  vaZhjNYKWQf79l6zXfOvphzJ
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
+  MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
+  D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
+  P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
+  BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
+  cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
+  b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
+  Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
+  If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
+  MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
+  i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
+  mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
+  BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
+  62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
+  YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
+  it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
+  TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
+  EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
+  oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
+  NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
+  BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
+  JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
+  baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
+  Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
+  yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
+  MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
+  xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
+  7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
+  BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
+  yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
+  cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
+  Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
+  Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB+DCCAWGgAwIBAgIJAKGd0vpks6T/MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
+  BAMMCUNPTVAtMTU4NDAgFw0xMzA2MjAxMjE5MjBaGA8yMTEzMDUyNzEyMTkyMFow
+  FDESMBAGA1UEAwwJQ09NUC0xNTg0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+  gQDZTH9etPUC+wMZQ3UIiOwyyCfHsJ+7duCFYjuo1uZrhtDt/fp8qb8qK9ob+df3
+  EEYgA0IgI2j/9jNUEnKbc5+OrfKznzXjrlrH7zU8lKBVNCLzQuqBKRNajZ+UvO8R
+  nlqK2jZCXP/p3HXDYUTEwIR5W3tVCEn/Vda4upTLcPVE5wIDAQABo1AwTjAdBgNV
+  HQ4EFgQU7KXaNDheQWoy5uOU01tn1M5vNkEwHwYDVR0jBBgwFoAU7KXaNDheQWoy
+  5uOU01tn1M5vNkEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQASmqCU
+  Znbvu6izdicvjuE3aKnBa7G++Fdp2bdne5VCwVbVLYCQWatB+n4crKqGdnVply/u
+  +uZ16u1DbO9rYoKgWqjLk1GfiLw5v86pd5+wZd5I9QJ0/Sbz2vZk5S4ciMIGwArc
+  m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAOcKrOH/2Da6MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtMjk3MCAXDTEyMDYyNjAzMDU1MVoYDzIxMTIwNjAyMDMwNTUxWjAT
+  MREwDwYDVQQDDAhDT01QLTI5NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  xzbOGlcoin2q+Mtp52r26Njliz2aoxIXbnOBUyDc/OGtk9nWA5uBtTc2zwR17um6
+  KV0bGyvuBA78XcvU+AIV/5s0ohBAX7yjRKmEhAYcFvov3EyWSdjOrqqo4qFSzOrK
+  sVQBlxIDpjQBH4F3lf6dBv6/M+tCT3iSv3aOZbsG0E8CAwEAAaNQME4wHQYDVR0O
+  BBYEFLqtrfTu+BIVt+TFiRUkIoiWIYrxMB8GA1UdIwQYMBaAFLqtrfTu+BIVt+TF
+  iRUkIoiWIYrxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc8N5P5gW
+  Jrdk9gF/3Cpp6THDiy93+WcuAm7zFwXPFNttJtFKMNObP2YRZvsQkvjezfrZoRBF
+  j8LgKB3tZCbBj+HDj+AeD+q9V+cqMFLKc6LezvQYUuum6bZdfUNnPv1K1ULYSPjq
+  /jsRBbabCWSXqxR6gYEM6ooauj3udBMXhHE=
+  -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIIB9jCCAV+gAwIBAgIJAKRvzcy7OH0UMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+  BAMMCENPTVAtNzcyMCAXDTEyMDgxMDE1NDI1MVoYDzIxMTIwNzE3MTU0MjUxWjAT
+  MREwDwYDVQQDDAhDT01QLTc3MjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+  o7aipd6MbnuGDeR1UJUjuMLQUariAyQ2l2ZDS6TfOwjHiPw/mhzkielgk73kqN7A
+  sUREx41eTcYCXzTq3WP3xCLE4LxLg1eIhd4nwNHj8H18xR9aP0AGjo4UFl5BOMa1
+  mwoyBt3VtfGtUmb8whpeJgHhqrPPxLoON+i6fIbXDaUCAwEAAaNQME4wHQYDVR0O
+  BBYEFEfjy3OopT2lOksKmKBNHTJE2hFlMB8GA1UdIwQYMBaAFEfjy3OopT2lOksK
+  mKBNHTJE2hFlMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAaNRx6YN2
+  M/p3R8/xS6zvH1EqJ3FFD7XeAQ52WuQnKSREzuw0dsw12ClxjcHiQEFioyTiTtjs
+  5pW18Ry5Ie7iFK4cQMerZwWPxBodEbAteYlRsI6kePV7Gf735Y1RpuN8qZ2sYL6e
+  x2IMeSwJ82BpdEI5niXxB+iT0HxhmR+XaMI=
+  -----END CERTIFICATE-----