Update release candidate

35f0f7fb · Łukasz Nowak · 1c15b793 · 17d8fe38 · 35f0f7fb · 35f0f7fb
Commit 35f0f7fb authored Feb 18, 2020 by Łukasz Nowak
72 changed files
--- a/component/dcron/buildout.cfg
+++ b/component/dcron/buildout.cfg
@@ -17,7 +17,7 @@ patches =
 patch-options = -p1
 make-options =
  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#860e914dff4108b47565965fe5ebc7b5:post_make_hook
+post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#d7985eef1ceef01af00ffb1d38708c8d:post_make_hook
 environment =
  PATH=${patch:location}/bin:%(PATH)s
 randomsleep_install = ${randomsleep:location}

--- a/component/dcron/dcron-hooks.py
+++ b/component/dcron/dcron-hooks.py
@@ -2,4 +2,4 @@ import os
 import shutil
 def post_make_hook(options, buildout):
  crontab_path = os.path.join(options['location'], 'bin', 'crontab')
-  os.chmod(crontab_path, 0750)
+  os.chmod(crontab_path, 0o750)
--- a/component/file/buildout.cfg
+++ b/component/file/buildout.cfg
@@ -21,4 +21,4 @@ environment =
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch#fb6f7d32ce89573bf4b4b302c812e394
+  https://git.in-ulm.de/cbiedl/file/raw/debian/1%255.37-6/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch#fb6f7d32ce89573bf4b4b302c812e394
--- a/component/file/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch
+++ b/component/file/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch
-Subject: Limit the number of elements in a vector (found by oss-fuzz)
-Origin: FILE5_37-67-g46a8443f <https://github.com/file/file/commit/FILE5_37-67-g46a8443f>
-Upstream-Author: Christos Zoulas <christos@zoulas.com>
-Date: Mon Aug 26 14:31:39 2019 +0000
-
--- a/src/cdf.c
-+++ b/src/cdf.c
-@@ -1013,8 +1013,9 @@
- 				goto out;
- 			}
- 			nelements = CDF_GETUINT32(q, 1);
-			if (nelements == 0) {
-				DPRINTF(("CDF_VECTOR with nelements == 0\n"));
-+			if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
-+				DPRINTF(("CDF_VECTOR with nelements == %"
-+				    SIZE_T_FORMAT "u\n", nelements));
- 				goto out;
- 			}
- 			slen = 2;
-@@ -1056,8 +1057,6 @@
- 					goto out;
- 				inp += nelem;
- 			}
-			DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
-			    nelements));
- 			for (j = 0; j < nelements && i < sh.sh_properties;
- 			    j++, i++)
- 			{
--- a/src/cdf.h
-+++ b/src/cdf.h
-@@ -48,6 +48,7 @@
- typedef int32_t cdf_secid_t;
- 
- #define CDF_LOOP_LIMIT					10000
-+#define CDF_ELEMENT_LIMIT				100000
- 
- #define CDF_SECID_NULL					0
- #define CDF_SECID_FREE					-1
--- a/component/libaio/buildout.cfg
+++ b/component/libaio/buildout.cfg
@@ -4,10 +4,9 @@ parts =

 [libaio]
 recipe = slapos.recipe.cmmi
-# originally located at http://www.kernel.org/pub/linux/libs/aio/
 shared = true
-url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3.109.orig.tar.gz
-md5sum = 435a5b16ca6198eaf01155263d855756
+url = https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz
+md5sum = 1ba264947d05bd8e0f9dc9a9ed80cf3e
 location = @@LOCATION@@
 configure-command = echo
 make-options = prefix=${:location}
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -14,6 +14,7 @@ extends =
  ../ncurses/buildout.cfg
  ../openssl/buildout.cfg
  ../patch/buildout.cfg
+  ../pcre/buildout.cfg
  ../pkgconfig/buildout.cfg
  ../readline/buildout.cfg
  ../snappy/buildout.cfg
@@ -46,7 +47,7 @@ configure-options =
  -DWITH_ZLIB=system
  -DWITH_READLINE=0
  -DWITH_PIC=1
-  -DWITH_PCRE=bundled
+  -DWITH_PCRE=system
  -DENABLE_DTRACE=0
  -DWITH_EXTRA_CHARSETS=complex
  -DWITH_EMBEDDED_SERVER=0
@@ -69,13 +70,17 @@ configure-options =
  -DCMAKE_LIBRARY_PATH=${unixodbc:location}/lib
  -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc
  -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++
-CMAKE_CFLAGS = -I${bzip2:location}/include -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${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
-CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib:${gcc:location}/lib:${gcc:location}/lib64
+CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
+CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib:${gcc:location}/lib:${gcc:location}/lib64
 environment =
  CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
  CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
-  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
+patch-options = -p1
+patches =
+  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.22-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
 post-install = set -e
  set -- wsrep-lib/wsrep-API/*/wsrep_api.h
  install -DpT $1 ${:location}/$1
@@ -104,6 +109,6 @@ patches =
  ${:_profile_base_location_}/mroonga_boolean.patch#c818568fe35ca6a4298f18e575d962a0
 environment =
  PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
+  CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
  LDFLAGS=-L${groonga:location}/lib
  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig
--- a/component/nginx/buildout.cfg
+++ b/component/nginx/buildout.cfg
@@ -30,8 +30,7 @@ configure-options=
  --with-cc-opt="-I ${openssl-1.0:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"

 [nginx-dav-ext-module]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
 url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz
 strip-top-level-dir = true
 md5sum = 2cb502dbda335be4ebd5fed0b3182bae

--- a/component/noVNC/buildout.cfg
+++ b/component/noVNC/buildout.cfg
@@ -3,8 +3,7 @@ parts =
  noVNC

 [noVNC]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
 # version-1.0.0 release on Feb 22, 2018
 url = https://github.com/novnc/noVNC/archive/v1.0.0.tar.gz
 md5sum = d63c2944abd12fecec6ec504e82f27c8

--- a/component/pcre/buildout.cfg
+++ b/component/pcre/buildout.cfg
 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts =
  pcre

 [pcre]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://ftp.pcre.org/pub/pcre/pcre-8.42.tar.bz2
-md5sum = 085b6aa253e0f91cae70b3cdbe8c1ac2
+url = https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.bz2
+md5sum = 636222e79e392c3d95dcc545f24f98c4
 configure-options =
  --disable-static
  --enable-unicode-properties
  --enable-jit
+patch-options = -p1
+patches =
+  https://sources.debian.org/data/main/p/pcre3/2:8.39-12/debian/patches/patch-from-mariadb-to-fix-stack-frame-si#c33964123a4648bbb86466b4f3476bb4
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
--- a/component/pysvn-python/buildout.cfg
+++ b/component/pysvn-python/buildout.cfg
@@ -13,7 +13,7 @@ egg =
  pysvn
 find-links = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.10.tar.gz
 patches =
-  ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#02d00b58d537242aa5bb5c9202dedbf1
+  ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#08371129e0d0a215fb7f7811a860a89c
  ${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch

--- a/component/pysvn-python/pysvn-1.7.10-inc_lib_dir.patch
+++ b/component/pysvn-python/pysvn-1.7.10-inc_lib_dir.patch
 diff -ur pysvn-1.7.10.orig/setup.py pysvn-1.7.10/setup.py
 --- pysvn-1.7.10.orig/setup.py	2010-12-30 13:26:51.000000000 +0100
 +++ pysvn-1.7.10/setup.py	2015-08-14 10:29:25.562686564 +0200
-@@ -19,6 +19,7 @@
+@@ -19,6 +19,10 @@
 import os
 import os.path
 import setuptools.command.bdist_egg
-+from ConfigParser import ConfigParser
+try:
+  from ConfigParser import ConfigParser
+except ImportError:
+  from configparser import ConfigParser
 
 pysvn_version_info = {}
 f = open( 'Builder/version.info', 'r' )

--- a/component/python3/buildout.cfg
+++ b/component/python3/buildout.cfg
@@ -17,16 +17,17 @@ extends =
  ../zlib/buildout.cfg

 parts =
-    python3.5
+    python3
+
+[python3]
+<= python3.6

 [python3-common]
 recipe = slapos.recipe.cmmi
+shared = true
 package_version_suffix =

-# This is actually the default setting for prefix, but we can't use it in
-# other settings in this part if we don't set it explicitly here.
-prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
-executable = ${:prefix}/bin/${:_buildout_section_name_}
+executable = @@LOCATION@@/bin/${:_buildout_section_name_}

 patch-options = -p1
 patches =
@@ -51,16 +52,10 @@ environment =
  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
  LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

-[python3.5]
-<= python3-common
-package_version = 3.5.3
-md5sum = 57d1f8bfbabf4f2500273fb0706e6f21
-
-[python3.6.6]
+[python3.6]
 <= python3-common
-package_version = 3.6.6
-md5sum = c3f30a0aff425dda77d19e02f420d6ba
-executable = @@LOCATION@@/bin/python3.6
+package_version = 3.6.10
+md5sum = 986078f11b39074be22a199e56491d98

 # Python 3.7 have to use gcc 8(actually, gcc 4+)
 # See https://bugs.python.org/issue34112
@@ -71,7 +66,6 @@ package_version = 3.7.2
 md5sum = df6ec36011808205beda239c72f947cb
 patch-options =
 patches =
-executable = @@LOCATION@@/bin/python3.7
 environment =
  PATH=${gcc-8.2:location}/bin::${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include

--- a/component/qemu-kvm/buildout.cfg
+++ b/component/qemu-kvm/buildout.cfg
@@ -72,19 +72,19 @@ md5sum = df0ce86d0b1d81e232ad08eef58754ed

 [debian-amd64-stretch-netinst.iso]
 <= debian-amd64-netinst-base
-version = 9.11.0
-md5sum = f525f0c3f1c4ca184a604a75dabf4f71
+version = 9.12.0
+md5sum = 50e7919f4276787f3a4631544edceae3

 [debian-amd64-netinst.iso]
 # Download the installer of Debian 10 (Buster)
 # XXX: This is not the latest version because
 #      Debian does not provide a stable URL for it.
 <= debian-amd64-netinst-base
-version = 10.1.0
-md5sum = b931ef8736c98704bcf519160b50fd83
+version = 10.2.0
+md5sum = 36de671429939e90f2a31ce3fbed0aaf

 [debian-amd64-testing-netinst.iso]
 <= debian-amd64-netinst-base
-release = daily-builds/daily/20191119-3
+release = daily-builds/daily/20200210-1
 version = testing
-md5sum = db9e0131f6cfd3eb0aa2b76fddb2f942
+md5sum = 437bdcbed2b279bea58b0a1ac3bd7ae2
--- a/component/randomsleep/buildout.cfg
+++ b/component/randomsleep/buildout.cfg
@@ -26,4 +26,4 @@ script =
  wrapper_script_path = os.path.join(self.options['bin_dir'], 'randomsleep')
  with open(wrapper_script_path, 'w') as f:
    f.write(self.options['wrapper_script_code'])
-  os.chmod(wrapper_script_path, 0750)
+  os.chmod(wrapper_script_path, 0o750)
--- a/component/serf/buildout.cfg
+++ b/component/serf/buildout.cfg
@@ -9,7 +9,7 @@ extends =

 [serf]
 recipe = slapos.recipe.cmmi
-url = https://serf.googlecode.com/files/serf-1.2.1.tar.bz2
+url = https://archive.apache.org/dist/serf/serf-1.2.1.tar.bz2
 md5sum = 4f8e76c9c6567aee1d66aba49f76a58b
 configure-options =
  --with-apr=${apache:location}/bin/apr-1-config

--- a/component/surykatka/buildout.hash.cfg
+++ b/component/surykatka/buildout.hash.cfg
@@ -14,4 +14,4 @@
 # not need these here).
 [surykatka-requirements]
 _update_hash_filename_ = requirements.txt
-md5sum = 2dfe4f8b8c5b6f5d3478b70e53c49201
+md5sum = c4bd35bcc5c9c25efe1edff5dd022605
--- a/component/surykatka/requirements.txt
+++ b/component/surykatka/requirements.txt
+Click==7.0
 certifi==2019.11.28
 chardet==3.0.4
-Click==7.0
 dnspython==1.16.0
 forcediphttpsadapter==1.0.1
 idna==2.8
 miniupnpc==2.0.2
 peewee==3.13.1
 requests==2.22.0
-surykatka==0.2.0
-urllib3==1.25.7
+surykatka==0.4.2
+urllib3==1.25.8
--- a/component/trafficserver/buildout.cfg
+++ b/component/trafficserver/buildout.cfg
@@ -28,6 +28,7 @@ configure-options =
  --disable-curl
  --disable-hwloc
  --enable-experimental-plugins
+  --disable-posix-cap
 environment =
  PATH=${libtool:location}/bin:${make:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ setup(name=name,
      packages=find_packages(),
      include_package_data=True,
      install_requires=[
-        'enum34',  # for inotify-simple
+        'enum34; python_version<"3.4"',  # for inotify-simple
        'jsonschema',
        'hexagonit.recipe.download',
        'netaddr', # to manipulate on IP addresses

--- a/software/agent/software.cfg
+++ b/software/agent/software.cfg
@@ -48,6 +48,6 @@ gitdb = 0.6.4
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 smmap = 0.9.0

--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -9,7 +9,7 @@ gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 smmap = 0.9.0
 numpy = 1.16.4


--- a/software/build-rina/software.cfg
+++ b/software/build-rina/software.cfg
@@ -84,4 +84,4 @@ packages +=
  python-dev

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/buildout-testing/software.cfg
+++ b/software/buildout-testing/software.cfg
@@ -59,4 +59,4 @@ template =
    raw runTestSuite_py ${buildout:bin-directory}/${runTestSuite_py:interpreter}

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/caddy-frontend/software.cfg
+++ b/software/caddy-frontend/software.cfg
@@ -22,7 +22,7 @@ gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 smmap = 0.9.0
 numpy = 1.16.4


--- a/software/cdn-me/software.cfg
+++ b/software/cdn-me/software.cfg
@@ -39,4 +39,4 @@ eggs =
 cns.recipe.symlink = 0.2.3
 collective.recipe.environment = 0.2.0
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/dream/software.cfg
+++ b/software/dream/software.cfg
@@ -53,7 +53,7 @@ mysqlclient = 1.3.12
 # indirect dependancies
 cp.recipe.cmd = 0.5
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 zope.exceptions = 4.0.7
 zope.testing = 4.1.3
 zc.recipe.testrunner = 2.0.0

--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -61,7 +61,7 @@ output = ${buildout:directory}/template-default.cfg
 mode = 0644

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 dnspython = 1.15.0
 PyXML = 0.8.5
 WebOb = 1.8.5

--- a/software/erp5testnode/testsuite/dummy/software.cfg
+++ b/software/erp5testnode/testsuite/dummy/software.cfg
@@ -15,4 +15,4 @@ md5sum = efd3b712a2294207f265a9c45648d5cf
 mode = 0644

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/fluentd/software.cfg
+++ b/software/fluentd/software.cfg
@@ -23,5 +23,5 @@ gems +=
  fluent-plugin-bin

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 rubygemsrecipe = 0.2.2+slapos001
--- a/software/gitlab/software.cfg
+++ b/software/gitlab/software.cfg
@@ -337,5 +337,5 @@ cns.recipe.symlink = 0.2.3
 docutils = 0.12
 plone.recipe.command = 1.1
 rubygemsrecipe  = 0.2.2+slapos001
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 z3c.recipe.scripts = 1.0.1
--- a/software/hellorina/software.cfg
+++ b/software/hellorina/software.cfg
@@ -42,4 +42,4 @@ mode = 755
 md5sum = 78b77a6bda9958f547f7d89b747731e3

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/helloworld/software.cfg
+++ b/software/helloworld/software.cfg
@@ -53,5 +53,5 @@ context =

 # Pin versions of eggs used that are not already pinned by stack/slapos.cfg
 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 rubygemsrecipe  = 0.2.2+slapos001
--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -71,7 +71,7 @@ async = 0.6.1
 gitdb = 0.5.4
 pycrypto = 2.6
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 smmap = 0.8.2
 plone.recipe.command = 1.1

--- a/software/html5ide/software.cfg
+++ b/software/html5ide/software.cfg
@@ -48,4 +48,4 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/jstestnode/software.cfg
+++ b/software/jstestnode/software.cfg
@@ -116,7 +116,7 @@ output = ${buildout:directory}/runTestSuite.in

 [versions]

-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 selenium = 3.14.1
 urllib3 = 1.24
 certifi = 2018.10.15
\ No newline at end of file
--- a/software/jupyter/software.cfg
+++ b/software/jupyter/software.cfg
@@ -85,7 +85,7 @@ pyzmq = 16.0.2
 scikit-learn = 0.18.1
 seaborn = 0.7.1
 simplegeneric = 0.8.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 statsmodels = 0.8.0
 terminado = 0.6
 tornado = 4.4.2

--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -198,7 +198,7 @@ websockify = 0.5.1
 collective.recipe.environment = 0.2.0
 gitdb = 0.6.4
 pycurl = 7.43.0
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 smmap = 0.9.0
 numpy = 1.16.4

--- a/software/monitor/buildout.hash.cfg
+++ b/software/monitor/buildout.hash.cfg
@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = d778b6f436ae6864819eb2ff2d12a86f
+md5sum = dc9770bacea2c504b92ad2162e58d222

 [template-monitor]
 _update_hash_filename_ = instance-monitor.cfg.jinja2
@@ -30,7 +30,7 @@ md5sum = 9e237dbdda59e788202f0da194a57d41

 [template-monitor-edgebot]
 _update_hash_filename_ = instance-monitor-edgebot.cfg.jinja2
-md5sum = 8786e4245db0d27dfa4815222d970e52
+md5sum = f28a329e830ed737d468abcb4e89e1a2

 [network-bench-cfg]
 filename = network_bench.cfg.in
@@ -42,4 +42,4 @@ md5sum = cad2402bbd21907cfed6bc5af8c5d3ab

 [template-surykatka-ini]
 _update_hash_filename_ = surykatka.ini.jinja2
-md5sum = 40870921e05d93b5843ab34abd7e3902
+md5sum = a2de719a5a65438c8c3ee5195442beb6
--- a/software/monitor/instance-edgetest-input-schema.json
+++ b/software/monitor/instance-edgetest-input-schema.json
@@ -22,7 +22,19 @@
    "check-certificate-expiration-days": {
      "default": "15",
      "title": "Default certificate expiration days check",
-      "description": "Default amount of days to consider certitifcate as being to-be-expired (default: 15).",
+      "description": "Default amount of days to consider certificate as being to-be-expired (default: 15).",
+      "type": "string"
+    },
+    "check-maximum-elapsed-time": {
+      "default": "2",
+      "title": "Default maximum elapsed time for a site to reply (seconds)",
+      "description": "Default maximum elapsed time for a site to reply to be considered good (default: 2s).",
+      "type": "string"
+    },
+    "failure-amount": {
+      "default": "1",
+      "title": "Default amount of failures to consider URL as in bad state",
+      "description": "Default amount of failures to consider URL as in bad state, can be set to higher value for endpoints with accepted short outages (default: 1).",
      "type": "string"
    }
  }

--- a/software/monitor/instance-edgetest-slave-input-schema.json
+++ b/software/monitor/instance-edgetest-slave-input-schema.json
@@ -21,7 +21,19 @@
    "check-certificate-expiration-days": {
      "default": "Master default",
      "title": "Certificate expiration days check",
-      "description": "Default amount of days to consider certitifcate as being to-be-expired (default: comes from master partition).",
+      "description": "Amount of days to consider certificate as being to-be-expired (default: comes from master partition).",
+      "type": "string"
+    },
+    "check-maximum-elapsed-time": {
+      "default": "Master default",
+      "title": "Maximum elapsed time for a site to reply (seconds)",
+      "description": "Maximum elapsed time for a site to reply to be considered good.(default: comes from master partition).",
+      "type": "string"
+    },
+    "failure-amount": {
+      "default": "Master default",
+      "title": "Amount of failures to consider URL as in bad state",
+      "description": "Amount of failures to consider URL as in bad state, can be set to higher value for endpoints with accepted short outages (default: comes from master partition).",
      "type": "string"
    }
  }

--- a/software/monitor/instance-monitor-edgebot.cfg.jinja2
+++ b/software/monitor/instance-monitor-edgebot.cfg.jinja2
@@ -5,7 +5,7 @@
 {%-     do CONFIGURATION.__setitem__(k[14:], v) %}
 {%-   endif %}
 {%- endfor %}
-{%- set slave_instance_list = [] %}
+{%- set slave_instance_dict = {} %}
 {%- set extra_slave_instance_list = slapparameter_dict.get('extra_slave_instance_list') %}
 {%- if extra_slave_instance_list %}
 {#- Create slaves to process with setting up defaults #}
@@ -16,19 +16,31 @@
 {%-   if 'check-certificate-expiration-days' not in slave %}
 {%-     do slave.__setitem__('check-certificate-expiration-days', CONFIGURATION['check-certificate-expiration-days']) %}
 {%-   endif %}
+{%-   if 'failure-amount' not in slave %}
+{%-     do slave.__setitem__('failure-amount', CONFIGURATION['failure-amount']) %}
+{%-   endif %}
+{%-   if 'check-maximum-elapsed-time' not in slave %}
+{%-     do slave.__setitem__('check-maximum-elapsed-time', CONFIGURATION['check-maximum-elapsed-time']) %}
+{%-   endif %}
 {%-   if 'check-frontend-ip' not in slave %}
 {%-     do slave.__setitem__('check-frontend-ip', CONFIGURATION['check-frontend-ip']) %}
 {%-   endif %}
 {%-   if 'url' in slave %}
-{%-     do slave_instance_list.append(slave) %}
+{%-     set class = slave['check-maximum-elapsed-time'] %}
+{%-     if class not in slave_instance_dict %}
+{%-       do slave_instance_dict.__setitem__(class, []) %}
+{%-     endif %}
+{%-     do slave_instance_dict[class].append(slave) %}
 {%-   endif %}
 {%-   endfor %}
 {%- endif %}
 {%- set part_list = [] %}
-{%- for slave in sorted(slave_instance_list) %}
-{%-   set part_id = 'http-query-' ~ slave['slave_reference'] ~ '-promise' %}
-{%-   do part_list.append(part_id) %}
-{%-   set safe_name = part_id.replace('_', '').replace('.', '-').replace(' ', '-') %}
+{%- for class, slave_instance_list in slave_instance_dict.items() %}
+{#- class is used to separate surykatka with different timeouts #}
+{%-   for slave in sorted(slave_instance_list) %}
+{%-     set part_id = 'http-query-' ~ slave['slave_reference'] ~ '-promise' %}
+{%-     do part_list.append(part_id) %}
+{%-     set safe_name = part_id.replace('_', '').replace('.', '-').replace(' ', '-') %}
 [{{part_id}}]
 <= monitor-promise-base
 module = check_surykatka_json
@@ -37,75 +49,81 @@ config-report = http_query
 config-url = {{ slave['url'] }}
 config-status-code = {{ slave['check-status-code'] }}
 config-certificate-expiration-days = {{ slave['check-certificate-expiration-days'] }}
+config-failure-amount = {{ slave['failure-amount'] }}
+config-maximum-elapsed-time = {{ slave['check-maximum-elapsed-time'] }}
 config-ip-list = {{ slave['check-frontend-ip'] }}
-config-json-file = ${surykatka-config:json}
-{% endfor %}
+config-json-file = ${surykatka-config-{{ class }}:json}
+{%-   endfor %}

-[surykatka-bot-promise]
+[surykatka-bot-promise-{{ class }}]
 <= monitor-promise-base
 module = check_surykatka_json
-name = surykatka-bot-promise.py
+name = surykatka-bot-promise-{{ class }}.py
 config-report = bot_status
-config-json-file = ${surykatka-config:json}
-
-[buildout]
-extends = {{ monitor_template_output }}
-
-parts =
-  cron
-  cron-entry-surykatka-status
-  monitor-base
-  publish-connection-information
-  surykatka
-  surykatka-bot-promise
-{% for part_id in sorted(part_list) %}
-  {{ part_id }}
-{% endfor %}
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
+config-json-file = ${surykatka-config-{{ class }}:json}

-[surykatka-config]
+[surykatka-config-{{ class }}]
 recipe = slapos.recipe.template:jinja2
-db = ${directory:srv}/surykatka.db
-rendered = ${directory:etc}/surykatka.ini
+db = ${directory:srv}/surykatka-{{ class }}.db
+rendered = ${directory:etc}/surykatka-{{ class }}.ini
 template = {{ template_surykatka_ini }}
 slave_instance_list = {{ dumps(slave_instance_list) }}
 nameserver = {{ dumps(CONFIGURATION['nameserver']) }}
-json = ${directory:srv}/surykatka.json
+json = ${directory:srv}/surykatka-{{ class }}.json
+{#- timeout is just a bit bigger than class time #}
+timeout = {{ int(class) + 2 }}

 context =
  import json_module json
  key db :db
  key nameserver :nameserver
  key slave_instance_list :slave_instance_list
+  key timeout :timeout

-[surykatka]
+[surykatka-{{ class }}]
 recipe = slapos.cookbook:wrapper
-config = ${surykatka-config:rendered}
+config = ${surykatka-config-{{ class }}:rendered}
 command-line =
  {{ surykatka_binary }} --run crawl --reload --configuration ${:config}
 wrapper-path = ${monitor-directory:service}/${:_buildout_section_name_}
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg

-[surykatka-status-json]
+[surykatka-status-json-{{ class }}]
 recipe = slapos.recipe.template:jinja2
+json = ${surykatka-config-{{ class }}:json}
 template = inline:#!/bin/sh
-  if {{ surykatka_binary }} --run status --configuration ${surykatka:config} --output json > ${surykatka-config:json}.tmp ; then
-    mv -f ${surykatka-config:json}.tmp ${surykatka-config:json}
+  if {{ surykatka_binary }} --run status --configuration ${surykatka-{{ class }}:config} --output json > ${:json}.tmp ; then
+    mv -f ${:json}.tmp ${:json}
  else
-    rm -f ${surykatka-config:json}.tmp
+    rm -f ${:json}.tmp
  fi
 rendered = ${monitor-directory:bin}/${:_buildout_section_name_}
 mode = 0755

-[cron-entry-surykatka-status]
+[cron-entry-surykatka-status-{{ class }}]
 recipe = slapos.cookbook:cron.d
 cron-entries = ${directory:etc}/cron.d
-name = surykatka-status
+name = surykatka-status-{{ class }}
 frequency = */2 * * * *
-command = ${surykatka-status-json:rendered}
+command = ${surykatka-status-json-{{ class }}:rendered}
+{%- do part_list.append('surykatka-' + class) %}
+{%- do part_list.append('surykatka-bot-promise-' + class) %}
+{%- do part_list.append('cron-entry-surykatka-status-' + class) %}
+{%- endfor %}
+
+[buildout]
+extends = {{ monitor_template_output }}
+parts =
+  cron
+  monitor-base
+  publish-connection-information
+{% for part_id in sorted(part_list) %}
+  {{ part_id }}
+{% endfor %}
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true

 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised

--- a/software/monitor/instance.cfg
+++ b/software/monitor/instance.cfg
@@ -44,6 +44,11 @@ context = import json_module json
          raw template_json_edgetest_test ${json-test-template:target}
 mode = 0644

+[surykatka-wrapped]
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${buildout:bin-directory}/surykatka-wrapped
+command-line = ${surykatka:location}/bin/python3.7 ${surykatka:executable}
+
 [instance-base-edgebot]
 recipe = slapos.recipe.template:jinja2
 template = ${template-monitor-edgebot:target}
@@ -59,7 +64,7 @@ context = import json_module json
          key slapparameter_dict slap-configuration:configuration
          key slap_software_type slap-configuration:slap-software-type
          raw software_type edgebot
-          key surykatka_binary :surykatka-binary
+          key surykatka_binary surykatka-wrapped:wrapper-path
          key template_surykatka_ini :template-surykatka-ini
          raw buildout_bin ${buildout:bin-directory}
          raw monitor_template_output ${monitor-template:output}
@@ -79,6 +84,8 @@ configuration.check-status-code = 200
 configuration.nameserver =
 configuration.check-frontend-ip =
 configuration.check-certificate-expiration-days = 15
+configuration.check-maximum-elapsed-time = 2
+configuration.failure-amount = 2
 # use monitor-base-port to have monitor listening on each instance
 # on different port and also on different port than other services
 # it makes it possible to instantiate it correctly on signle IP, for

--- a/software/monitor/software.cfg
+++ b/software/monitor/software.cfg
@@ -87,4 +87,4 @@ eggs +=
  plone.recipe.command

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/monitor/surykatka.ini.jinja2
+++ b/software/monitor/surykatka.ini.jinja2
 [SURYKATKA]
 INTERVAL = 120
+TIMEOUT = {{ timeout }}
 SQLITE = {{ db }}
 {%- set nameserver_list = nameserver.split() %}
 {%- if len(nameserver_list) > 0 %}

--- a/software/monitor/test/test.py
+++ b/software/monitor/test/test.py
@@ -25,6 +25,7 @@
 #
 ##############################################################################

+import glob
 import json
 import os
 import re
@@ -150,14 +151,29 @@ class EdgeSlaveMixin(MonitorTestMixin):
      shared=True
    )

+  def updateSurykatkaDict(self):
+    class_list = self.surykatka_dict.keys()
+    for class_ in class_list:
+      update_dict = {}
+      update_dict['ini-file'] = os.path.join(
+        self.bot_partition_path, 'etc', 'surykatka-%s.ini' % (class_,))
+      update_dict['json-file'] = os.path.join(
+        self.bot_partition_path, 'srv', 'surykatka-%s.json' % (class_,))
+      update_dict['status-json'] = os.path.join(
+        self.bot_partition_path, 'bin', 'surykatka-status-json-%s' % (class_,))
+      update_dict['bot-promise'] = 'surykatka-bot-promise-%s.py' % (class_,)
+      update_dict['status-cron'] = os.path.join(
+        self.bot_partition_path, 'etc', 'cron.d', 'surykatka-status-%s' % (
+          class_,))
+      update_dict['db_file'] = os.path.join(
+        self.bot_partition_path, 'srv', 'surykatka-%s.db' % (class_,))
+      self.surykatka_dict[class_].update(update_dict)
+
  def setUp(self):
    self.bot_partition_path = os.path.join(
      self.slap.instance_directory,
      self.__partition_reference__ + '1')
-    self.surykatka_json = os.path.join(
-        self.bot_partition_path, 'srv', 'surykatka.json')
-    self.surykatka_status_json = os.path.join(
-        self.bot_partition_path, 'bin', 'surykatka-status-json')
+    self.updateSurykatkaDict()
    self.monitor_configuration_list = [
      {
        'xmlUrl': 'https://[%s]:9700/public/feed' % (self._ipv6_address,),
@@ -180,15 +196,17 @@ class EdgeSlaveMixin(MonitorTestMixin):
    ]

  def assertSurykatkaIni(self):
-    surykatka_ini = open(
-      os.path.join(
-        self.bot_partition_path, 'etc', 'surykatka.ini')).read().strip()
-
-    expected = self.surykatka_ini % dict(
-        partition_path=self.bot_partition_path)
    self.assertEqual(
-      expected.strip(),
-      surykatka_ini)
+      set(
+        glob.glob(
+          os.path.join(self.bot_partition_path, 'etc', 'surykatka*.ini'))),
+      set([q['ini-file'] for q in self.surykatka_dict.values()])
+    )
+    for info_dict in self.surykatka_dict.values():
+      self.assertEqual(
+        info_dict['expected_ini'].strip() % info_dict,
+        open(info_dict['ini-file']).read().strip()
+      )

  def assertPromiseContent(self, name, content):
    promise = open(
@@ -199,23 +217,21 @@ class EdgeSlaveMixin(MonitorTestMixin):
    self.assertTrue(content in promise)

  def assertSurykatkaBotPromise(self):
-    self.assertPromiseContent(
-      'surykatka-bot-promise.py',
-      "'report': 'bot_status'")
-    self.assertPromiseContent(
-      'surykatka-bot-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
-    )
+    for info_dict in self.surykatka_dict.values():
+      self.assertPromiseContent(
+        info_dict['bot-promise'],
+        "'report': 'bot_status'")
+      self.assertPromiseContent(
+        info_dict['bot-promise'],
+        "'json-file': '%s'" % (info_dict['json-file'],)
+      )

  def assertSurykatkaCron(self):
-    surykatka_cron = open(
-      os.path.join(
-        self.bot_partition_path, 'etc', 'cron.d', 'surykatka-status')
-        ).read().strip()
-    self.assertEqual(
-      '*/2 * * * * %s' % (self.surykatka_status_json,),
-      surykatka_cron
-    )
+    for info_dict in self.surykatka_dict.values():
+      self.assertEqual(
+        '*/2 * * * * %s' % (info_dict['status-json'],),
+        open(info_dict['status-cron']).read().strip()
+      )

  def initiateSurykatkaRun(self):
    try:
@@ -224,15 +240,20 @@ class EdgeSlaveMixin(MonitorTestMixin):
      pass

  def assertSurykatkaStatusJSON(self):
-    if os.path.exists(self.surykatka_json):
-      os.unlink(self.surykatka_json)
-    env = os.environ.copy()
-    env.pop('PYTHONPATH', None)
-    subprocess.check_call(self.surykatka_status_json, shell=True, env=env)
-    self.assertTrue(os.path.exists(self.surykatka_json))
-    with open(self.surykatka_json) as fh:
-      status_json = json.load(fh)
-    self.assertIn('bot_status', status_json)
+    for info_dict in self.surykatka_dict.values():
+      if os.path.exists(info_dict['json-file']):
+        os.unlink(info_dict['json-file'])
+      env = os.environ.copy()
+      env.pop('PYTHONPATH', None)
+      try:
+        subprocess.check_call(info_dict['status-json'], shell=True, env=env)
+      except subprocess.CalledProcessError as e:
+        self.fail('%s failed with code %s and message %s' % (
+          info_dict['status-json'], e.returncode, e.output))
+      self.assertTrue(os.path.exists(info_dict['json-file']))
+      with open(info_dict['json-file']) as fh:
+        status_json = json.load(fh)
+      self.assertIn('bot_status', status_json)

  def test(self):
    # Note: Those tests do not run surykatka and do not do real checks, as
@@ -252,12 +273,15 @@ class EdgeSlaveMixin(MonitorTestMixin):


 class TestEdge(EdgeSlaveMixin, SlapOSInstanceTestCase):
-  surykatka_ini = """[SURYKATKA]
+  surykatka_dict = {
+    2: {'expected_ini': """[SURYKATKA]
 INTERVAL = 120
-SQLITE = %(partition_path)s/srv/surykatka.db
+TIMEOUT = 4
+SQLITE = %(db_file)s
 URL =
  https://www.erp5.com/
-  https://www.erp5.org/"""
+  https://www.erp5.org/"""}
+  }

  def assertSurykatkaPromises(self):
    self.assertPromiseContent(
@@ -277,7 +301,11 @@ URL =
      "'url': 'https://www.erp5.org/'")
    self.assertPromiseContent(
      'http-query-backend-300-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-300-promise.py',
+      "'failure-amount': '2'"
    )

    self.assertPromiseContent(
@@ -297,7 +325,11 @@ URL =
      "'url': 'https://www.erp5.com/'")
    self.assertPromiseContent(
      'http-query-backend-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'failure-amount': '2'"
    )

  def requestEdgetestSlaves(self):
@@ -313,15 +345,18 @@ URL =

 class TestEdgeNameserverCheckFrontendIp(
  EdgeSlaveMixin, SlapOSInstanceTestCase):
-  surykatka_ini = """[SURYKATKA]
+  surykatka_dict = {
+    2: {'expected_ini': """[SURYKATKA]
 INTERVAL = 120
-SQLITE = %(partition_path)s/srv/surykatka.db
+TIMEOUT = 4
+SQLITE = %(db_file)s
 NAMESERVER =
  127.0.1.1
  127.0.1.2

 URL =
-  https://www.erp5.com/"""
+  https://www.erp5.com/"""}
+  }

  @classmethod
  def getInstanceParameterDict(cls):
@@ -348,7 +383,11 @@ URL =
      "'url': 'https://www.erp5.com/'")
    self.assertPromiseContent(
      'http-query-backend-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'failure-amount': '2'"
    )

  def requestEdgetestSlaves(self):
@@ -359,12 +398,15 @@ URL =


 class TestEdgeCheckStatusCode(EdgeSlaveMixin, SlapOSInstanceTestCase):
-  surykatka_ini = """[SURYKATKA]
+  surykatka_dict = {
+    2: {'expected_ini': """[SURYKATKA]
 INTERVAL = 120
-SQLITE = %(partition_path)s/srv/surykatka.db
+TIMEOUT = 4
+SQLITE = %(db_file)s
 URL =
  https://www.erp5.com/
-  https://www.erp5.org/"""
+  https://www.erp5.org/"""}
+  }

  @classmethod
  def getInstanceParameterDict(cls):
@@ -390,7 +432,11 @@ URL =
      "'url': 'https://www.erp5.org/'")
    self.assertPromiseContent(
      'http-query-backend-501-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-501-promise.py',
+      "'failure-amount': '2'"
    )

    self.assertPromiseContent(
@@ -410,7 +456,11 @@ URL =
      "'url': 'https://www.erp5.com/'")
    self.assertPromiseContent(
      'http-query-backend-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'failure-amount': '2'"
    )

  def requestEdgetestSlaves(self):
@@ -426,12 +476,15 @@ URL =

 class TestEdgeCheckCertificateExpirationDays(
  EdgeSlaveMixin, SlapOSInstanceTestCase):
-  surykatka_ini = """[SURYKATKA]
+  surykatka_dict = {
+    2: {'expected_ini': """[SURYKATKA]
 INTERVAL = 120
-SQLITE = %(partition_path)s/srv/surykatka.db
+TIMEOUT = 4
+SQLITE = %(db_file)s
 URL =
  https://www.erp5.com/
-  https://www.erp5.org/"""
+  https://www.erp5.org/"""}
+  }

  @classmethod
  def getInstanceParameterDict(cls):
@@ -457,7 +510,11 @@ URL =
      "'url': 'https://www.erp5.org/'")
    self.assertPromiseContent(
      'http-query-backend-20-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'failure-amount': '2'"
    )

    self.assertPromiseContent(
@@ -477,7 +534,11 @@ URL =
      "'url': 'https://www.erp5.com/'")
    self.assertPromiseContent(
      'http-query-backend-promise.py',
-      "'json-file': '%s'" % (self.surykatka_json,)
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'failure-amount': '2'"
    )

  def requestEdgetestSlaves(self):
@@ -490,3 +551,188 @@ URL =
      {'url': 'https://www.erp5.org/',
       'check-certificate-expiration-days': '20'},
    )
+
+
+class TestEdgeCheckMaximumElapsedTime(
+  EdgeSlaveMixin, SlapOSInstanceTestCase):
+  surykatka_dict = {
+    5: {'expected_ini': """[SURYKATKA]
+INTERVAL = 120
+TIMEOUT = 7
+SQLITE = %(db_file)s
+URL =
+  https://www.erp5.com/"""},
+    20: {'expected_ini': """[SURYKATKA]
+INTERVAL = 120
+TIMEOUT = 22
+SQLITE = %(db_file)s
+URL =
+  https://www.erp5.org/"""},
+    1: {'expected_ini': """[SURYKATKA]
+INTERVAL = 120
+TIMEOUT = 3
+SQLITE = %(db_file)s
+URL =
+  https://www.erp5.net/"""}
+  }
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      'check-maximum-elapsed-time': '5',
+    }
+
+  def assertSurykatkaPromises(self):
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'ip-list': ''")
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'report': 'http_query'")
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'status-code': '200'")
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'maximum-elapsed-time': '20'")
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'url': 'https://www.erp5.org/'")
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'json-file': '%s'" % (self.surykatka_dict[20]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-20-promise.py',
+      "'failure-amount': '2'"
+    )
+
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'ip-list': ''")
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'report': 'http_query'")
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'status-code': '200'")
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'maximum-elapsed-time': '5'")
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'url': 'https://www.erp5.com/'")
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'json-file': '%s'" % (self.surykatka_dict[5]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-default-promise.py',
+      "'failure-amount': '2'"
+    )
+
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'ip-list': ''")
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'report': 'http_query'")
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'status-code': '200'")
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'maximum-elapsed-time': '1'")
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'url': 'https://www.erp5.net/'")
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'json-file': '%s'" % (self.surykatka_dict[1]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-1-promise.py',
+      "'failure-amount': '2'"
+    )
+
+  def requestEdgetestSlaves(self):
+    self.requestEdgetestSlave(
+      'backend-default',
+      {'url': 'https://www.erp5.com/'},
+    )
+    self.requestEdgetestSlave(
+      'backend-20',
+      {'url': 'https://www.erp5.org/',
+       'check-maximum-elapsed-time': '20'},
+    )
+    self.requestEdgetestSlave(
+      'backend-1',
+      {'url': 'https://www.erp5.net/',
+       'check-maximum-elapsed-time': '1'},
+    )
+
+
+class TestEdgeFailureAmount(
+  EdgeSlaveMixin, SlapOSInstanceTestCase):
+  surykatka_dict = {
+    2: {'expected_ini': """[SURYKATKA]
+INTERVAL = 120
+TIMEOUT = 4
+SQLITE = %(db_file)s
+URL =
+  https://www.erp5.org/
+  https://www.erp5.com/"""}
+  }
+
+  @classmethod
+  def getInstanceParameterDict(cls):
+    return {
+      'failure-amount': '5'
+    }
+
+  def assertSurykatkaPromises(self):
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'report': 'http_query'")
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'status-code': '200'")
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'url': 'https://www.erp5.com/'")
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-promise.py',
+      "'failure-amount': '5'"
+    )
+
+    self.assertPromiseContent(
+      'http-query-backend-10-promise.py',
+      "'report': 'http_query'")
+    self.assertPromiseContent(
+      'http-query-backend-10-promise.py',
+      "'status-code': '200'")
+    self.assertPromiseContent(
+      'http-query-backend-10-promise.py',
+      "'url': 'https://www.erp5.org/'")
+    self.assertPromiseContent(
+      'http-query-backend-10-promise.py',
+      "'json-file': '%s'" % (self.surykatka_dict[2]['json-file'],)
+    )
+    self.assertPromiseContent(
+      'http-query-backend-10-promise.py',
+      "'failure-amount': '10'"
+    )
+
+  def requestEdgetestSlaves(self):
+    self.requestEdgetestSlave(
+      'backend',
+      {'url': 'https://www.erp5.com/'},
+    )
+    self.requestEdgetestSlave(
+      'backend-10',
+      {'url': 'https://www.erp5.org/', 'failure-amount': '10'},
+    )
--- a/software/nayuos/software.cfg
+++ b/software/nayuos/software.cfg
@@ -19,7 +19,7 @@ parts +=
 versions = versions

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4


 [template-instance]

--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -166,7 +166,7 @@ persistent = 4.5.0
 pycrypto = 2.6.1
 pycurl = 7.43.0
 setproctitle = 1.1.10
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 smmap2 = 2.0.1
 transaction = 1.7.0
 zodbpickle = 1.0.4

--- a/software/neoppod/stress-testing/software.cfg
+++ b/software/neoppod/stress-testing/software.cfg
@@ -82,4 +82,4 @@ packages +=
  screen xz-utils

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/nextcloud/software.cfg
+++ b/software/nextcloud/software.cfg
@@ -33,7 +33,7 @@ rendered = ${buildout:directory}/instance-nextcloud.cfg
 extensions = jinja2.ext.do
 context = 
          key gzip_location          gzip:location
-          key python3_location       python3.6.6:location
+          key python3_location       python3:location
          key news_updater_location  news-updater:location
          key php_location           apache-php:location
          raw redis_bin              ${redis:location}/bin/redis-server

--- a/software/nginx-push-stream/software.cfg
+++ b/software/nginx-push-stream/software.cfg
@@ -45,7 +45,7 @@ output = ${buildout:directory}/instance-nginx.cfg.in
 mode = 0644

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 inotifyx = 0.2.2
 gitdb2 = 2.0.3
 smmap2 = 2.0.3
--- a/software/plantuml/software.cfg
+++ b/software/plantuml/software.cfg
@@ -36,4 +36,4 @@ url = https://downloads.sourceforge.net/project/plantuml/1.2018.13/plantuml.1.20
 md5sum = cda05c8163237de039d777c197b3d282

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/powerdns/software.cfg
+++ b/software/powerdns/software.cfg
@@ -52,7 +52,7 @@ mode = 0644
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 dnspython = 1.15.0
 passlib = 1.7.1
 GitPython = 2.1.11

--- a/software/proftpd/software.cfg
+++ b/software/proftpd/software.cfg
@@ -44,5 +44,5 @@ context =
 [versions]
 collective.recipe.environment = 1.1.0
 collective.recipe.grp = 1.1.0
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 plone.recipe.command = 1.1
--- a/software/pureftpd/software.cfg
+++ b/software/pureftpd/software.cfg
@@ -34,4 +34,4 @@ context =


 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/pyodide/software.cfg
+++ b/software/pyodide/software.cfg
@@ -36,4 +36,4 @@ output = ${buildout:directory}/instance.cfg
 output = ${buildout:directory}/runTestSuite.in

 [versions]
-slapos.recipe.template = 4.3
\ No newline at end of file
+slapos.recipe.template = 4.4
\ No newline at end of file
--- a/software/re6stnet/software.cfg
+++ b/software/re6stnet/software.cfg
@@ -89,7 +89,7 @@ context =

 [versions]
 re6stnet = 0.551
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4

 # Required by:
 # re6stnet==0.533

--- a/software/seleniumrunner/software.cfg
+++ b/software/seleniumrunner/software.cfg
@@ -34,4 +34,4 @@ output = ${buildout:directory}/template.cfg

 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/seleniumserver/software.cfg
+++ b/software/seleniumserver/software.cfg
@@ -46,4 +46,4 @@ output = ${buildout:directory}/template-selenium.cfg

 [versions]
 plone.recipe.command = 1.1
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/slapos-in-partition/software.cfg
+++ b/software/slapos-in-partition/software.cfg
@@ -11,4 +11,4 @@ extends = common.cfg
 Pygments = 1.6
 collective.recipe.environment = 0.2.0
 collective.recipe.template = 1.10
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/slapos-sr-testing/software.cfg
+++ b/software/slapos-sr-testing/software.cfg
@@ -191,7 +191,7 @@ plantuml = 0.1.1
 pysftp = 0.2.9
 requests-toolbelt = 0.8.0
 selenium = 3.141.0
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4

 # modern versions for SSL fixed support
 requests = 2.20.0

--- a/software/slapos-testing/buildout.hash.cfg
+++ b/software/slapos-testing/buildout.hash.cfg
@@ -15,5 +15,5 @@

 [template]
 filename = instance.cfg
-md5sum = b48db2861644d9e9c30d2652c100d70e
+md5sum = 47eb5f8e6f56729e2ce0e6213bccf4f7

--- a/software/slapos-testing/instance.cfg
+++ b/software/slapos-testing/instance.cfg
@@ -66,6 +66,10 @@ repository = ${slapos.recipe.template-repository:location}
 <= download-source
 repository = ${slapos.toolbox-repository:location}

+[slapos.rebootstrap]
+<= download-source
+repository = ${slapos.rebootstrap-repository:location}
+

 [slapos-test-runner]
 recipe = slapos.cookbook:wrapper
@@ -73,7 +77,7 @@ wrapper-path = $${create-directory:bin}/runTestSuite
 command-line =
  ${buildout:bin-directory}/runTestSuite
  --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
-  --source_code_path_list=$${kedifa:location},$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location},$${slapos.libnetworkcache:location}
+  --source_code_path_list=$${kedifa:location},$${caucase:location},$${erp5.util:location},$${slapos.cookbook:location},$${slapos.core:location},$${slapos.recipe.build:location},$${slapos.recipe.cmmi:location},$${slapos.recipe.template:location},$${slapos.toolbox:location},$${slapos.libnetworkcache:location},$${slapos.rebootstrap:location}

 # Notes about environment:
 # * slapos.cookbook:wrapper does not seem to allow "extending" PATH. Tests

--- a/software/slapos-testing/software-py3.cfg
+++ b/software/slapos-testing/software-py3.cfg
@@ -2,11 +2,11 @@
 extends =
  ../../component/python3/buildout.cfg
  software.cfg
-python = python3.5
+python = python3

 [nghttp2]
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3.5:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${python3:location}/bin:%(PATH)s

 [supervisor-repository]
 <= git-clone-repository

--- a/software/slapos-testing/software.cfg
+++ b/software/slapos-testing/software.cfg
@@ -89,6 +89,10 @@ egg = slapos.toolbox
 setup = ${slapos.toolbox-repository:location}
 depends = ${slapos.core-setup:egg}

+[slapos.rebootstrap-setup]
+<= setup-develop-egg
+egg = slapos.rebootstrap[test]
+setup = ${slapos.rebootstrap-repository:location}

 [eggs]
 recipe = zc.recipe.egg
@@ -109,6 +113,7 @@ eggs =
  ${slapos.recipe.template-setup:egg}
  ${slapos.toolbox-setup:egg}
  ${slapos.libnetworkcache-setup:egg}
+  ${slapos.rebootstrap-setup:egg}
  mock
  zope.testing
  httmock
@@ -176,6 +181,9 @@ repository = https://lab.nexedi.com/nexedi/slapos.recipe.cmmi.git
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/slapos.toolbox.git

+[slapos.rebootstrap-repository]
+<= git-clone-repository
+repository = https://lab.nexedi.com/nexedi/slapos.rebootstrap.git

 [template]
 recipe = slapos.recipe.template
@@ -191,7 +199,7 @@ erp5.util =

 # All depencies should be pinned.
 Pygments = 2.1.3
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 zc.lockfile = 1.4
 bcrypt = 3.1.4
 dnspython = 1.15.0

--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -170,7 +170,7 @@ gitdb = 0.6.4
 gunicorn = 19.7.1
 prettytable = 0.7.2
 pycurl = 7.43.0
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 collective.recipe.environment = 0.2.0
 smmap = 0.9.0
 lockfile = 0.12.2

--- a/software/srslte/software.cfg
+++ b/software/srslte/software.cfg
@@ -73,5 +73,5 @@ url     = ${:_profile_base_location_}/config/${:filename}
 filename = user_db.csv

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
 apache-libcloud = 2.4.0
--- a/software/test-slave-instance-deployment/software.cfg
+++ b/software/test-slave-instance-deployment/software.cfg
@@ -59,7 +59,7 @@ eggs = collective.recipe.template
 collective.recipe.template = 1.11
 plone.recipe.command = 1.1
 slapos.recipe.build = 0.28
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4

 # Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
 [buildout]

--- a/software/theia/software.cfg
+++ b/software/theia/software.cfg
@@ -26,10 +26,6 @@ parts =
 [nodejs]
 <= nodejs-10.6.0

-[python3]
-<= python3.6.6
-
-
 [yarn]
 # this could become a component, but it needs to be invoked from nodejs explicitly,
 # otherwise it uses system's nodejs
@@ -216,4 +212,4 @@ mode = 0644
 output = ${buildout:directory}/instance.cfg

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/turnserver/software.cfg
+++ b/software/turnserver/software.cfg
@@ -30,4 +30,4 @@ output = ${buildout:directory}/instance.cfg
 <= download-base

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/software/varnish/software.cfg
+++ b/software/varnish/software.cfg
@@ -62,4 +62,4 @@ md5sum = 0ea12a4ad2d2e3d406476e35b8d3e3fb
 mode = 640

 [versions]
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -85,7 +85,7 @@ PasteScript = 2.0.2
 WSGIUtils = 0.7
 python-magic = 0.4.6
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.4

 # Required by:
 # PasteScript==2.0

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -138,14 +138,14 @@ pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
 slapos.cookbook = 1.0.124
-slapos.core = 1.5.8
+slapos.core = 1.5.9
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20
-slapos.rebootstrap = 4.3
+slapos.rebootstrap = 4.4
 slapos.recipe.build = 0.42
 slapos.recipe.cmmi = 0.12
-slapos.toolbox = 0.104
+slapos.toolbox = 0.106
 stevedore = 1.21.0
 subprocess32 = 3.5.3
 unicodecsv = 0.14.1
@@ -261,7 +261,7 @@ rpdb = 0.1.5

 # Required by:
 # slapos.core==1.5.0
-supervisor = 3.3.3
+supervisor = 4.1.0

 # Required by:
 # slapos.toolbox==0.94