merge with upstream-master

component/autoconf/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../m4/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
+  ../gnu-config/buildout.cfg
 parts =
   autoconf
 
@@ -11,6 +12,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
 md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/autoconf-2.69-shebang_workaround.patch#9d286e6f9c271dff361891e381be706d

component/gcc/buildout.cfg

@@ -71,6 +71,12 @@ patches =
 <= gcc-common
 version = 8.2.0
 md5sum = 4ab282f414676496483b3e1793d07862
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+# glibc-2.31-libsanitizer comes from https://github.com/spack/spack/pull/15403
+patches =
+  ${:_profile_base_location_}/glibc-2.31-libsanitizer-1.patch
+  ${:_profile_base_location_}/glibc-2.31-libsanitizer-2.patch
 
 [gcc-minimal]
 <= gcc-5.5

component/gcc/glibc-2.31-libsanitizer-1.patch

+From ce9568e9e9cf6094be30e748821421e703754ffc Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Fri, 8 Nov 2019 19:53:18 +0100
+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
+ bootstrap due to libsanitizer)
+
+	Backported from mainline
+	2019-10-22  Tamar Christina  <tamar.christina@arm.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.cc:
+	Cherry-pick compiler-rt revision r375220.
+
+From-SVN: r277981
+---
+ libsanitizer/ChangeLog                                   | 9 +++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc  | 6 +++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 6cd4a5bac8b0..06a605ff4670 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1156,8 +1156,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
++#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
++    !defined(__arm__)
+ /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
++/* On Arm glibc 2.31 and later provide a different mode field, this field is
++   never used by libsanitizer so we can simply ignore this assert for all glibc
++   versions.  */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 

component/gcc/glibc-2.31-libsanitizer-2.patch

+From 75003cdd23c310ec385344e8040d490e8dd6d2be Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Fri, 20 Dec 2019 17:58:35 +0100
+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
+ bootstrap due to libsanitizer)
+
+	Backported from mainline
+	2019-11-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
+	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
+
+From-SVN: r279653
+---
+ libsanitizer/ChangeLog                            | 10 ++++++++++
+ .../sanitizer_platform_limits_posix.cc            |  9 +++------
+ .../sanitizer_platform_limits_posix.h             | 15 +--------------
+ 3 files changed, 14 insertions(+), 20 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 06a605ff4670..d823a12190c0 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1156,12 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
+-    !defined(__arm__)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+-/* On Arm glibc 2.31 and later provide a different mode field, this field is
+-   never used by libsanitizer so we can simply ignore this assert for all glibc
+-   versions.  */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++   on many architectures.  */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+index 73af92af1e8f..6a673a7c9959 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -211,26 +211,13 @@ namespace __sanitizer {
+     u64 __unused1;
+     u64 __unused2;
+ #elif defined(__sparc__)
+-#if defined(__arch64__)
+     unsigned mode;
+-    unsigned short __pad1;
+-#else
+-    unsigned short __pad1;
+-    unsigned short mode;
+     unsigned short __pad2;
+-#endif
+     unsigned short __seq;
+     unsigned long long __unused1;
+     unsigned long long __unused2;
+-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
+-    unsigned int mode;
+-    unsigned short __seq;
+-    unsigned short __pad1;
+-    unsigned long __unused1;
+-    unsigned long __unused2;
+ #else
+-    unsigned short mode;
+-    unsigned short __pad1;
++    unsigned int mode;
+     unsigned short __seq;
+     unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)

component/gdbm/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts =
   gdbm
 
 [gdbm]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 1.11
+version = 1.18
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = 72c832680cf0999caedbe5b265c8c1bd
+md5sum = e316f8e4a3e7e4f23955be65d54fec48
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/extern_parseopt.patch#30baeaaa0c6a6e6be8cf56a875726619
 configure-options =
   --disable-static
   --enable-libgdbm-compat
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares
 # (eg. python's dbmmodule.c extension) assume the location like this.
 includedir = @@LOCATION@@/include
 make-targets =
   install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
-# it seems that parallel build sometimes fails for gdbm.
-make-options =
-  -j1

component/gdbm/extern_parseopt.patch

+--- a/src/parseopt.c
++++ b/src/parseopt.c
+@@ -255,8 +255,8 @@
+ }
+ 
+ char *parseopt_program_name;
+-char *parseopt_program_doc;
+-char *parseopt_program_args;
++extern char *parseopt_program_doc;
++extern char *parseopt_program_args;
+ const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ void (*parseopt_help_hook) (FILE *stream);
+ 

component/gnu-config/buildout.cfg

+[gnu-config]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=5e531d391852a54e7fab2d8ff55625fca514b305;sf=tgz
+md5sum = ffe323c69b6f21aa28e900f76febd3d6
+configure-command = :
+make-targets =  
+make-binary = cp -r . @@LOCATION@@
\ No newline at end of file

component/golang/buildout.cfg

@@ -64,7 +64,7 @@ environment-extra =
 url = https://dl.google.com/go/go1.12.9.src.tar.gz
 md5sum = 6132109d4050da349eadc9f7b0304ef4
 
-# go1.11 needs go1.4 to bootstrap
+# go1.12 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
@@ -77,6 +77,15 @@ md5sum = 4ad8b04f962be93a32f3021e6f35b3b9
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
+[golang1.14]
+<= golang-common
+url = https://dl.google.com/go/go1.14.3.src.tar.gz
+md5sum = 6b1fb42d219e2ea8925002013c76d4c7
+
+# go1.14 needs go1.4 to bootstrap
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang14:location}
+
 # ---- infrastructure to build Go workspaces / projects ----
 
 # gowork is a top-level section representing workspace

component/haproxy/buildout.cfg

@@ -19,9 +19,12 @@ configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".
 # For ARCH value, x86_64 and i[3456]86 are supported.
+# CPU is generic, and not native, as in SlapOS software released are
+# distributed in binary form, which may lead to incompatibility of such
+# compilation optimisation across various CPUs
 make-options =
   TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6\.2[89]|2\.6\.[3-9]|[3-9])' && echo linux-glibc || echo generic)"
-  CPU=native
+  CPU=generic
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=@@LOCATION@@
   USE_DL=1

component/java-jdk/buildout.cfg

+[buildout]
+
+extends = 
+  ../patchelf/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts = 
+  java-jdk
+
+
+[java-jdk]
+recipe = plone.recipe.command
+command = echo "Error: unsupported platform" && false
+stop-on-error = true
+location =
+
+
+[java-jdk:linux and bits64]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
+md5sum = f5da6f4dec81bdd2a096184ec1d69216
+configure-command = :
+make-binary = :
+pre-install =
+  mkdir -p @@LOCATION@@
+  cp -r * @@LOCATION@@
+post-install =
+  for file in @@LOCATION@@/bin/* ; do
+    echo appending rpath to $file
+	  ${patchelf:location}/bin/patchelf --set-rpath ${:rpath} $file
+  done
+rpath = ${zlib:location}/lib:@@LOCATION@@/lib
+location = @@LOCATION@@

component/jpegoptim/buildout.cfg

+# Jpegoptim - utility to optimize jpeg files.
+# https://www.kokkonen.net/tjko/projects.html
+
+[buildout]
+extends =
+  ../libjpeg/buildout.cfg
+
+[jpegoptim]
+recipe = slapos.recipe.cmmi
+url = https://www.kokkonen.net/tjko/src/jpegoptim-1.4.6.tar.gz
+md5sum = 844c572d69fd5af75f0616b86e63962d
+configure-options =
+  --with-libjpeg=${libjpeg:location}
+environment =
+  LDFLAGS=-Wl,-rpath=${libjpeg:location}/lib

component/libestr/buildout.cfg

@@ -4,5 +4,6 @@ parts =
 
 [libestr]
 recipe = slapos.recipe.cmmi
-url = http://libestr.adiscon.com/files/download/libestr-0.1.10.tar.gz
-md5sum = f4c9165a23587e77f7efe65d676d5e8e
+url = http://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz
+md5sum = 1f25a2332750d4bfacfb314235fedff0
+shared = true

component/libfastjson/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../m4/buildout.cfg
+
+parts =
+  libfastjson
+
+[libfastjson]
+recipe = slapos.recipe.cmmi
+url = https://github.com/rsyslog/libfastjson/archive/v0.99.8.tar.gz
+md5sum = 730713ad1d851def7ac8898f751bbfdd
+shared = true
+pre-configure =
+  autoreconf -fvi -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I ${automake:location}/share/aclocal
+
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+  M4=${m4:location}/bin/m4

component/libyaml/buildout.cfg

 [buildout]
+extends = ../gnu-config/buildout.cfg
 
 parts =
   libyaml
@@ -8,3 +9,4 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz
 md5sum = 5fe00cda18ca5daeb43762b80c38e06e
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/
\ No newline at end of file

component/make/buildout.cfg

@@ -16,6 +16,7 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
 md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
+shared = true
 patches =
   ${:_profile_base_location_}/make-dfsg_3.81-8.2.diff#320ce09344a8618b6c47ddb88c09cea9
 patch-options = -p1

component/optipng/buildout.cfg

+# OptiPNG is a PNG optimizer that recompresses image files to a smaller size, without losing any information.
+# http://optipng.sourceforge.net/
+
+[buildout]
+extends =
+  ../libpng/buildout.cfg
+  ../zlib/buildout.cfg
+
+[optipng]
+recipe = slapos.recipe.cmmi
+url = http://prdownloads.sourceforge.net/optipng/optipng-0.7.7.tar.gz
+md5sum = 211101965baf42fd24a2aa990b7e842e
+configure-options =
+  --with-system-libpng
+  --with-system-zlib
+environment =
+  CPPFLAGS=-I${libpng:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/patchelf/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts = 
+  patchelf
+
+[patchelf]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/NixOS/patchelf/archive/0.11.tar.gz
+md5sum = 6cffb77ee7a95bd314d954a6aeb53a02
+pre-configure = 
+  autoreconf -vif
+environment =
+  PATH=${pkgconfig:location}/bin:${autoconf:location}/bin:${automake:location}/bin:%(PATH)s

component/powerdns/buildout.cfg

@@ -2,33 +2,42 @@
 extends =
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
-  ../bison/buildout.cfg
-  ../flex/buildout.cfg
-  ../git/buildout.cfg
   ../boost-lib/buildout.cfg
   ../libtool/buildout.cfg
   ../make/buildout.cfg
-  ../mariadb/buildout.cfg
+  ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
-  ../ragel/buildout.cfg
   ../zlib/buildout.cfg
 
+# For geoip backend
+# https://doc.powerdns.com/authoritative/backends/geoip.html
+  ../geoip2/buildout.cfg
+  ../yaml-cpp/buildout.cfg
+
 parts =
   powerdns
 
 [powerdns]
 recipe = slapos.recipe.cmmi
-url = http://downloads.powerdns.com/releases/pdns-3.3.1.tar.gz
-md5sum = 074e2ff211fd12ecad25b5c1cc190dd4
+url = http://downloads.powerdns.com/releases/pdns-4.2.1.tar.bz2
+md5sum = b5f3998a3bc438b905c72c0473408839
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-boost=${boost-lib:location}
-  --with-modules="geo"
+  --with-libcrypto=${openssl:location}
+  --with-modules="geoip"
   --with-dynmodules=""
   --without-lua
+  --disable-lua-records
+pkg_config_depends = ${yaml-cpp:location}/lib/pkgconfig
 environment =
-  PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:${bison:location}/bin:${flex:location}/bin:${git:location}/bin:${ragel:location}/bin:%(PATH)s
-  LDFLAGS=-L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lz
-  CPPFLAGS=-I${boost-lib:location}/include
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libmaxminddb:location}/bin:${libtool:location}/bin:${make:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS=-L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${libmaxminddb:location}/lib -Wl,-rpath=${libmaxminddb:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${yaml-cpp:location}/lib -Wl,-rpath=${yaml-cpp:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${boost-lib:location}/include -I${libmaxminddb:location}/include -I${yaml-cpp:location}/include
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+# XXX: Override the default value "-Llib -lyaml-cpp"; "-Llib" is a problem
+  YAML_LIBS = -lyaml-cpp
+make-options =
+  LIBTOOL=libtool
 make-target =
   install

component/qemu-kvm/buildout.cfg

@@ -63,16 +63,16 @@ md5sum = df0ce86d0b1d81e232ad08eef58754ed
 
 [debian-amd64-stretch-netinst.iso]
 <= debian-amd64-netinst-base
-version = 9.12.0
-md5sum = 50e7919f4276787f3a4631544edceae3
+version = 9.13.0
+md5sum = 6097fdb9cbab47c96471274b9044e983
 
 [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.3.0
-md5sum = 5956434be4b81e6376151b64ef9b1596
+version = 10.4.0
+md5sum = e2ddc8268e4c164c32b4ba25be52c9af
 
 [debian-amd64-testing-netinst.iso]
 <= debian-amd64-netinst-base

component/rsyslogd/buildout.cfg

@@ -2,21 +2,25 @@
 parts =
   rsyslogd
 extends =
+  ../curl/buildout.cfg
   ../libestr/buildout.cfg
-  ../json-c/buildout.cfg
+  ../libfastjson/buildout.cfg
   ../libuuid/buildout.cfg
   ../zlib/buildout.cfg
 
 [rsyslogd]
 recipe = slapos.recipe.cmmi
-url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.12.0.tar.gz
-md5sum = c31c2d545c8a3b8695bdf076851d1517
+url = https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2006.0.tar.gz
+md5sum = 33de768941953ceeca9d1a437b47891b
+shared = true
 configure-options =
   --disable-klog
   --disable-libgcrypt
   --disable-liblogging-stdlog
+  --disable-libsystemd
 environment =
-  PKG_CONFIG_PATH=${libestr:location}/lib/pkgconfig:${json-c:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig
-  CPPFLAGS=-I${libestr:location}/include -I${json-c:location}/include -I${libuuid:location}/include -I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${libestr:location}/lib -Wl,-rpath=${json-c:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libestr:location}/lib/pkgconfig:${curl:location}/lib/pkgconfig:${libfastjson:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig
+  CPPFLAGS=-I${libestr:location}/include -I${curl:location}/include -I${libfastjson:location}/include -I${libuuid:location}/include -I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${libestr:location}/lib -Wl,-rpath=${curl:location}/lib -Wl,-rpath=${libfastjson:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   ZLIB_CFLAGS=-I${zlib:location}/include

component/slapos/obs.cfg

@@ -13,6 +13,10 @@ extensions =
 extends-cache = extends-cache
 download-cache = download-cache
 
+[gcc]
+# force usage of gcc from slapos
+max_version = 0
+
 # Uguu, upstream buildout.cfg must be patched as it works the other way
 # around from a packager point of view at least, thus at the end static
 # path, such as Python HOME directory, are wrong...
@@ -86,8 +90,12 @@ environment +=
 pre-configure =
   sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
 environment +=
+  PATH=${pkgconfig:location}/bin:${python:location}/bin:%(PATH)s
   LD_LIBRARY_PATH=${dbus:location}/lib
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${dbus:location}/lib -Wl,-rpath=${dbus:location}/lib
+  PYTHON=${python:location}/bin/python${python:version}
+  PYTHON_INCLUDES=-I${python:location}/include/python${python:version}
+  PYTHON_LIBS=-L${python:location}/lib -lpython${python:version} -lpthread -ldl -lutil -lm
 post-install =
   sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
 
@@ -110,7 +118,7 @@ make-options =
 
 [gobject-introspection]
 pre-configure =
-  ln -s ${python2.7:location}/bin/python2.7 ${python2.7:location}/bin/python2.
+  ln -s ${python:location}/bin/python${python:version} ${python:location}/bin/python2.
   sed -i 's#!/opt/slapos/parts/python2.7/bin/python2.7#!${python2.7:location}/bin/python2.7#' ${python2.7:location}/bin/python-config
   libtoolize -c -f
   aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal -I${glib:location}/share/aclocal
@@ -120,24 +128,24 @@ configure-options +=
 environment +=
   PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${flex:location}/bin:${bison-go:location}/bin:%(PATH)s
   GIR_DIR=${buildout:parts-directory}/${:_buildout_section_name_}/share/gir-1.0
-  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${python2.7:location}/include/python2.7
-  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi -L${python2.7:location}/lib
+  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${python:location}/include/python${python:version}
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi -L${python:location}/lib
   ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal
   M4=${m4:location}/bin/m4
   PERL5LIB=${perl:location}/lib/5.28.1/
 
 post-install = 
-  sed -i 's#!${python2.7:location}/bin/python2.7#!/opt/slapos/parts/python2.7/bin/python2.7#' ${python2.7:location}/bin/python-config
+  sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python-config
   rm -rf ${bison-go:location}
 
 [pygobject3]
 pre-configure +=
-  sed -i 's#!/opt/slapos/parts/python2.7/bin/python2.7#!${python2.7:location}/bin/python2.7#' ${python2.7:location}/bin/python-config
+  sed -i 's#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#!${python:location}/bin/python${python:version}#' ${python:location}/bin/python-config
 environment +=
-  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gettext:location}/include -I${libffi:location}/include -I${python2.7:location}/include/python2.7
-  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${python2.7:location}/lib
+  CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gettext:location}/include -I${libffi:location}/include -I${python:location}/include/python${python:version}
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${python:location}/lib
 post-install =
-  sed -i 's#!${python2.7:location}/bin/python2.7#!/opt/slapos/parts/python2.7/bin/python2.7#' ${python2.7:location}/bin/python-config
+  sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python-config
 
 [ncurses]
 configure-options =

component/tcl/buildout.cfg

@@ -5,8 +5,8 @@ parts = tcl
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/tcl/tcl8.5.15-src.tar.gz
 md5sum = f3df162f92c69b254079c4d0af7a690f
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+shared = true
 configure-command = ./unix/configure
 configure-options =
-  --prefix=${:location}
+  --prefix=@@LOCATION@@
   --with-encoding=utf-8

component/trafficserver/buildout.cfg

@@ -16,8 +16,9 @@ parts =
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = http://apache.claz.org/trafficserver/trafficserver-7.1.6.tar.bz2
-md5sum = 45f67cd652fa3481f76ff92213325c84
+url = http://apache.claz.org/trafficserver/trafficserver-7.1.11.tar.bz2
+md5sum = 74e8c1e2d7cdc0b97420d8b813321258
+shared = true
 configure-options =
   --with-openssl=${openssl:location}
   --with-pcre=${pcre:location}

component/yaml-cpp/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+
+parts =
+  yaml-cpp
+
+[yaml-cpp]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz
+md5sum = b45bf1089a382e81f6b661062c10d0c2
+location = @@LOCATION@@
+configure-command =
+  mkdir build && cd build && \
+  ${cmake:location}/bin/cmake \
+    -DYAML_BUILD_SHARED_LIBS=ON \
+    -DCMAKE_INSTALL_PREFIX=${:location} \
+    ..
+make-options = -C build

release-sr

@@ -21,7 +21,7 @@ echo "###################################################################"
 git tag 1.0.$NEXT_MINOR_VERSION -m "Release 1.0.$NEXT_MINOR_VERSION"
 
 
-echo " Please review current tag and them push it:"
+echo " Please review current tag and then push it:"
 echo " To review use git log 1.0.$NEXT_MINOR_VERSION"
 
 echo ""

slapos/recipe/generic_mysql/mysql.py

@@ -43,7 +43,7 @@ def updateMysql(mysql_upgrade_binary, mysql_binary, mysql_script_file):
         break
       print 'SlapOS initialisation script succesfully applied on database.'
       return
-    sleep = max(sleep+1, 30)
+    sleep = min(sleep+1, 30)
     print 'Sleeping for %ss and retrying' % sleep
     sys.stdout.flush()
     sys.stderr.flush()

software/caddy-frontend/CHANGES.caddy_frontend.rst

+Changes
+=======
+
+Here are listed the most important changes, which might affect upgrades.
+
+1.0.159 (2020-07-30)
+--------------------
+
+ * logs are ensured to be available in slave's ``log-access-url``
+ * logs from backend Haproxy are also available to slaves
+
+1.0.158 (2020-07-24)
+--------------------
+
+ * manual customisation of profiles has been dropped, as not used, dropped keys are ``apache_custom_http``, ``apache_custom_https``, ``caddy_custom_http``, ``caddy_custom_https`` from slaves and ``-frontend-authorized-slave-string`` from master
+ * ``re6st-optimal-test`` has been dropped from slave
+ * QUIC is dropped, as was not used and has been superseded by HTTP/3, dropped key is ``enable-quic`` from master
+ * haproxy is used as a gateway to backends:
+
+   * ``automatic-internal-backend-client-caucase-csr`` switch for master is introduced to control it CSR signing
+   * ``proxy-try-duration`` and ``proxy-try-interval`` has been dropped, as Caddy is not used anymore to connect to the backend, and instead ``backend-connect-timeout`` and ``backend-connect-retries`` is used, as it comes from Haproxy
+   * ``backend-client-caucase-url`` is returned in master and slave, so that backends can use caucase to fetch CA from frontend cluster
+   * ``request-timeout`` is supported per slave, as now it became possible
+   * ``authenticate-to-backend`` is added for master and slave, defaulting to False, to have control over cluster default authentication, and make it possible to do it per slave
+
+1.0.149 (2020-05-05)
+--------------------
+
+ * no changes noted

software/caddy-frontend/README.caddy_frontend.rst

@@ -21,7 +21,7 @@ About frontend replication
 
 Slaves of the root instance are sent as a parameter to requested frontends which will process them. The only difference is that they will then return the would-be published information to the root instance instead of publishing it. The root instance will then do a synthesis and publish the information to its slaves. The replicate instance only use 5 type of parameters for itself and will transmit the rest to requested frontends.
 
-These parameters are :
+These parameters are:
 
   * ``-frontend-type`` : the type to deploy frontends with. (default to 2)
   * ``-frontend-quantity`` : The quantity of frontends to request (default to "default")
@@ -30,7 +30,7 @@ These parameters are :
   * ``-frontend-software-release-url``: Software release to be used for frontends, default to the current software release
   * ``-sla-i-foo`` : where "i" is the number of the concerned frontend (between 1 and "-frontend-quantity") and "foo" a sla parameter.
 
-for example::
+For example::
 
   <parameter id="-frontend-quantity">3</parameter>
   <parameter id="-frontend-type">custom-personal</parameter>
@@ -170,24 +170,6 @@ This replaces old request parameters:
 (*Note*: They are still supported for backward compatibility, but any value send to the ``key-upload-url`` will supersede information from SlapOS Master.)
 
 
-How to have custom configuration in frontend server - XXX - to be written
-=========================================================================
-
-In your instance directory, you, as sysadmin, can directly edit two
-configuration files that won't be overwritten by SlapOS to customize your
-instance:
-
- * ``$PARTITION_PATH/srv/srv/apache-conf.d/apache_frontend.custom.conf``
- * ``$PARTITION_PATH/srv/srv/apache-conf.d/apache_frontend.virtualhost.custom.conf``
-
-The first one is included in the end of the main apache configuration file.
-The second one is included in the virtualhost of the main apache configuration file.
-
-SlapOS will just create those two files for you, then completely forget them.
-
-*Note*: make sure that the UNIX user of the instance has read access to those
-files if you edit them.
-
 Instance Parameters
 ===================
 
@@ -263,17 +245,6 @@ Necessary to activate cache.
 
 ``enable_cache`` is an optional parameter.
 
-Functionalities for Caddy configuration
----------------------------------------
-
-In the slave Caddy configuration you can use parameters that will be replaced during instantiation. They should be entered as python templates parameters ex: ``%(parameter)s``:
-
-  * ``cache_access`` : url of the cache. Should replace backend url in configuration to use the cache
-  * ``access_log`` : path of the slave error log in order to log in a file.
-  * ``error_log`` : path of the slave access log in order to log in a file.
-  * ``certificate`` : path to the certificate
-
-
 Examples
 ========
 
@@ -460,6 +431,18 @@ Then specify in the master instance parameters:
  * set ``port`` to ``443``
  * set ``plain_http_port`` to ``80``
 
+Authentication to the backend
+=============================
+
+The cluster generates CA served by caucase, available with ``backend-client-caucase-url`` return parameter.
+
+Then, each slave configured with ``authenticate-to-backend`` to true, will use a certificate signed by this CA while accessing https backend.
+
+This allows backends to:
+
+ * restrict access only from some frontend clusters
+ * trust values (like ``X-Forwarded-For``) sent by the frontend
+
 Technical notes
 ===============
 
@@ -472,11 +455,22 @@ Instantiating caddy-frontend results with a cluster in various partitions:
  * kedifa (contains kedifa server)
  * caddy-frontend-N which contains the running processes to serve sites - this partition can be replicated by ``-frontend-quantity`` parameter
 
-So it means sites are served in `caddy-frontend-N` partition, and this partition is structured as:
+It means sites are served in ``caddy-frontend-N`` partition, and this partition is structured as:
+
+ * Caddy serving the browser [client-facing-caddy]
+ * (optional) Apache Traffic Server for caching [ats]
+ * Haproxy as a way to communicate to the backend [backend-facing-haproxy]
+ * some other additional tools (6tunnel, monitor, etc)
+
+In case of slaves without cache (``enable_cache = False``) the request will travel as follows::
 
- * Caddy serving the browser
- * (optional) Apache Traffic Server for caching
- * Caddy connected to the backend
+  client-facing-caddy --> backend-facing-haproxy --> backend
+
+In case of slaves using cache (``enable_cache = True``) the request will travel as follows::
+
+  client-facing-caddy --> ats --> backend-facing-haproxy --> backend
+
+Usage of Haproxy as a relay to the backend allows much better control of the backend, removes the hassle of checking the backend from Caddy and allows future developments like client SSL certificates to the backend or even health checks.
 
 Kedifa implementation
 ---------------------
@@ -493,3 +487,32 @@ Support for X-Real-Ip and X-Forwarded-For
 -----------------------------------------
 
 X-Forwarded-For and X-Real-Ip are transmitted to the backend, but only for IPv4 access to the frontend. In case of IPv6 access, the provided IP will be wrong, because of using 6tunnel.
+
+Automatic Internal Caucase CSR
+------------------------------
+
+Cluster is composed on many instances, which are landing on separate partitions, so some way is needed to bootstrap trust between the partitions.
+
+There are two ways to achieve it:
+
+ * use default, Automatic Internal Caucase CSR used to replace human to sign CSRs against internal CAUCASEs automatic bootstrap, which leads to some issues, described later
+ * switch to manual bootstrap, which requires human to create and manage user certificate (with caucase-updater) and then sign new frontend nodes appearing in the system
+
+The issues during automatic bootstrap are:
+
+ * rouge or hacked SlapOS Master can result with adding rouge frontend nodes to the cluster, which will be trusted, so it will be possible to fetch all certificates and keys from Kedifa or to login to backends
+ * when new node is added there is short window, when rouge person is able to trick automatic signing, and have it's own node added
+
+In both cases promises will fail on node which is not able to get signed, but in case of Kedifa the damage already happened (certificates and keys are compromised). So in case if cluster administrator wants to stay on the safe side, both automatic bootstraps shall be turned off.
+
+How the automatic signing works
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Having in mind such structure:
+
+ * instance with caucase: ``caucase-instance``
+ * N instances which want to get their CSR signed: ``csr-instance``
+
+In ``caucase-instance`` CAUCASE user is created by automatically signing one user certificate, which allows to sign service certificates.
+
+The ``csr-instance`` creates CSR, extracts the ID of the CSR, exposes it via HTTP and ask caucase on ``caucase-instance`` to sign it. The ``caucase-instance`` checks that exposed CSR id matches the one send to caucase and by using created user to signs it.

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 20f7a925e686949092823595c79a0523
+md5sum = dae3bf6daf851b5610a1a6bd83057b29
 
 [template-common]
 filename = instance-common.cfg.in
@@ -22,15 +22,15 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 0851faa528eb4f21330a6f23f77dea7f
+md5sum = 43b3763d4086283e9c7c886e3b89e54b
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = a544bf7586f5945bbf108abe9818c7dd
+md5sum = 19debfbc27c464f451b1eb5bb5ce3c84
 
 [template-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 9da1616d203e4909af37e658aa923d95
+md5sum = 8f518a7b543126ce91fe218255fb201c
 
 [template-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -38,7 +38,7 @@ md5sum = 7e3ee70c447f8203273d78f66ab519c3
 
 [template-caddy-frontend-configuration]
 _update_hash_filename_ = templates/Caddyfile.in
-md5sum = f0faf6d2e6c187df7e25bf717676f9df
+md5sum = 2503056e35463e045db3329bb8b6fae8
 
 [caddy-backend-url-validator]
 filename = templates/caddy-backend-url-validator.in
@@ -50,11 +50,11 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-slave-virtualhost]
 _update_hash_filename_ = templates/default-virtualhost.conf.in
-md5sum = a72e9056eeda3c7c794f6f6560056380
+md5sum = 266f175dbdfc588af7a86b0b1884fe73
 
-[template-cached-slave-virtualhost]
-_update_hash_filename_ = templates/cached-virtualhost.conf.in
-md5sum = e839ca3cb308f7fcdfa06c2f1b95e93f
+[template-backend-haproxy-configuration]
+_update_hash_filename_ = templates/backend-haproxy.cfg.in
+md5sum = 68a7758ca8f8b544ba9bc756824be3d3
 
 [template-log-access]
 _update_hash_filename_ = templates/template-log-access.conf.in
@@ -94,7 +94,7 @@ md5sum = 061cc244558fd3af2b6bacf17cae5555
 
 [template-validate-script]
 _update_hash_filename_ = templates/validate-script.sh.in
-md5sum = f26e11574f266c7437c9c89e3c93825a
+md5sum = 53e5d7ba2827bff003051f74f24ffe4f
 
 [template-configuration-state-script]
 _update_hash_filename_ = templates/configuration-state-script.sh.in
@@ -114,4 +114,8 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 9d6111a5d6bc07e708116ca331925241
+md5sum = f77744e52f9d028c39f99cfbf31eadaf
+
+[template-backend-haproxy-rsyslogd-conf]
+_update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in
+md5sum = be899b04e1aa652ed510f20d4ea523dd

software/caddy-frontend/common.cfg

@@ -10,6 +10,8 @@ extends =
   ../../component/trafficserver/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/xz-utils/buildout.cfg
+  ../../component/rsyslogd/buildout.cfg
+  ../../component/haproxy/buildout.cfg
 
   ../../stack/caucase/buildout.cfg
 # Monitoring stack (keep on bottom)
@@ -94,6 +96,8 @@ bin_directory = ${buildout:bin-directory}
 sixtunnel = ${6tunnel:location}
 caddy = ${caddy:output}
 caddy_location = ${caddy:location}
+haproxy_executable = ${haproxy:location}/sbin/haproxy
+rsyslogd_executable = ${rsyslogd:location}/sbin/rsyslogd
 curl = ${curl:location}
 dash = ${dash:location}
 gzip = ${gzip:location}
@@ -108,7 +112,8 @@ kedifa-csr = ${:bin_directory}/kedifa-csr
 xz_location = ${xz-utils:location}
 
 monitor_template = ${monitor-template:output}
-template_cached_slave_virtualhost = ${template-cached-slave-virtualhost:target}
+template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
+template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
 template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
 template_graceful_script = ${template-graceful-script:target}
 template_validate_script = ${template-validate-script:target}
@@ -184,7 +189,7 @@ mode = 640
 [template-default-slave-virtualhost]
 <=download-template
 
-[template-cached-slave-virtualhost]
+[template-backend-haproxy-configuration]
 <=download-template
 
 [template-log-access]
@@ -222,3 +227,6 @@ mode = 0644
 
 [template-configuration-state-script]
 <=download-template
+
+[template-backend-haproxy-rsyslogd-conf]
+<=download-template

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

@@ -14,6 +14,8 @@ parts =
   switch-caddy-softwaretype
   caucase-updater
   caucase-updater-promise
+  backend-client-caucase-updater
+  backend-client-caucase-updater-promise
   frontend-caddy-graceful
   port-redirection
   promise-frontend-caddy-configuration
@@ -21,8 +23,6 @@ parts =
   promise-caddy-frontend-v4-http
   promise-caddy-frontend-v6-https
   promise-caddy-frontend-v6-http
-  promise-caddy-frontend-cached
-  promise-caddy-frontend-ssl-cached
 
   trafficserver-launcher
   trafficserver-reload
@@ -43,6 +43,15 @@ parts =
   monitor-caddy-server-status-wrapper
   monitor-verify-re6st-connectivity
 
+  backend-haproxy-rsyslogd-configuration
+  backend-haproxy-rsyslogd
+  logrotate-entry-backend-haproxy
+  backend-haproxy
+  backend-haproxy-graceful
+  promise-backend-haproxy-http
+  promise-backend-haproxy-https
+  promise-backend-haproxy-configuration
+
 # Create all needed directories
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -57,10 +66,12 @@ template = ${buildout:directory}/template/
 backup = ${:srv}/backup
 log = ${:var}/log
 run = ${:var}/run
+backend-haproxy-rsyslogd-spool = ${:run}/backend-haproxy-rsyslogd-spool
 service = ${:etc}/service
 etc-run = ${:etc}/run
 
 ca-dir = ${:srv}/ssl
+backend-client-dir = ${:srv}/backend-client
 # BBB: SlapOS Master non-zero knowledge BEGIN
 bbb-ssl-dir = ${:srv}/bbb-ssl
 # BBB: SlapOS Master non-zero knowledge END
@@ -147,7 +158,8 @@ context =
 [software-release-path]
 template-empty = {{ parameter_dict['template_empty'] }}
 template-default-slave-virtualhost = {{ parameter_dict['template_default_slave_virtualhost'] }}
-template-cached-slave-virtualhost = {{ parameter_dict['template_cached_slave_virtualhost'] }}
+template-backend-haproxy-configuration = {{ parameter_dict['template_backend_haproxy_configuration'] }}
+template-backend-haproxy-rsyslogd-conf = {{ parameter_dict['template_backend_haproxy_rsyslogd_conf'] }}
 caddy-location = {{ parameter_dict['caddy_location'] }}
 
 [kedifa-login-config]
@@ -191,6 +203,59 @@ stop-on-error = True
      template_csr='${kedifa-login-csr:template-csr}'
 )}}
 
+[kedifa-configuration]
+caucase-url = {{ slapparameter_dict['kedifa-caucase-url'] }}
+ca-certificate = ${kedifa-login-config:ca-certificate}
+certificate = ${kedifa-login-config:certificate}
+cas-ca-certificate = ${kedifa-login-config:cas-ca-certificate}
+csr = ${caucase-updater-csr:csr}
+crl = ${kedifa-login-config:crl}
+kedifa-updater = {{ parameter_dict['kedifa-updater'] }}
+kedifa-updater-mapping-file = ${directory:etc}/kedifa_updater_mapping.txt
+kedifa-updater-state-file = ${directory:srv}/kedifa_updater_state.json
+slave_kedifa_information = {{ dumps(slapparameter_dict['slave-kedifa-information']) }}
+
+[backend-client-login-config]
+d = ${directory:backend-client-dir}
+template-csr = ${:d}/csr.pem
+key = ${:d}/certificate.pem
+certificate = ${:key}
+ca-certificate = ${:d}/ca.pem
+cas-ca-certificate = ${:d}/cas-ca.pem
+crl = ${:d}/crl.pem
+
+[backend-client-login-csr]
+recipe = plone.recipe.command
+organization = {{ slapparameter_dict['cluster-identification'] }}
+organizational_unit = {{ instance_parameter['configuration.frontend-name'] }}
+command =
+{% if slapparameter_dict['backend-client-caucase-url'] %}
+  if [ ! -f ${:template-csr} ] && [ ! -f ${:key} ]  ; then
+    {{ parameter_dict['openssl'] }} req -new -sha256 \
+      -newkey rsa:2048 -nodes -keyout ${:key} \
+      -subj "/O=${:organization}/OU=${:organizational_unit}" \
+      -out ${:template-csr}
+  fi
+{% endif %}
+  test -f ${:key} && test -f ${:template-csr}
+update-command = ${:command}
+template-csr = ${backend-client-login-config:template-csr}
+key = ${backend-client-login-config:key}
+stop-on-error = True
+
+{{ caucase.updater(
+     prefix='backend-client-caucase-updater',
+     buildout_bin_directory=parameter_dict['bin_directory'],
+     updater_path='${directory:service}/backend-client-login-certificate-caucase-updater',
+     url=slapparameter_dict['backend-client-caucase-url'],
+     data_dir='${directory:srv}/backend-client-caucase-updater',
+     crt_path='${backend-client-login-config:certificate}',
+     ca_path='${backend-client-login-config:ca-certificate}',
+     crl_path='${backend-client-login-config:crl}',
+     key_path='${backend-client-login-csr:key}',
+     template_csr='${backend-client-login-csr:template-csr}'
+)}}
+
 [dynamic-custom-personal-template-slave-list]
 < = jinja2-template-base
 template = {{ parameter_dict['template_slave_list'] }}
@@ -198,82 +263,60 @@ filename = custom-personal-instance-slave-list.cfg
 slave_instance_list = {{ dumps(instance_parameter['slave-instance-list']) }}
 extra_slave_instance_list = {{ dumps(instance_parameter.get('configuration.extra_slave_instance_list')) }}
 master_key_download_url = {{ dumps(slapparameter_dict['master-key-download-url']) }}
-slave_kedifa_information = {{ dumps(slapparameter_dict['slave-kedifa-information']) }}
 local_ipv4 = {{ dumps(instance_parameter['ipv4-random']) }}
 local_ipv6 = {{ dumps(instance_parameter['ipv6-random']) }}
 software_type = single-custom-personal
 bin_directory = {{ parameter_dict['bin_directory'] }}
 caddy_executable = {{ parameter_dict['caddy'] }}
-caucase_url = {{ slapparameter_dict['kedifa-caucase-url'] }}
 sixtunnel_executable = {{ parameter_dict['sixtunnel'] }}/bin/6tunnel
-kedifa-updater = {{ parameter_dict['kedifa-updater'] }}
-kedifa-updater-mapping-file = ${directory:etc}/kedifa_updater_mapping.txt
-kedifa-updater-state-file = ${directory:srv}/kedifa_updater_state.json
-kedifa-csr = {{ parameter_dict['kedifa-csr'] }}
-service_directory = ${directory:service}
+organization = {{ slapparameter_dict['cluster-identification'] }}
+organizational-unit = {{ instance_parameter['configuration.frontend-name'] }}
+backend-client-caucase-url = {{ slapparameter_dict['backend-client-caucase-url'] }}
 extra-context =
-    key kedifa_caucase_ca_certificate kedifa-login-config:ca-certificate
-    key kedifa_login_certificate kedifa-login-config:certificate
     key caddy_configuration_directory caddy-directory:slave-configuration
-    key caddy_cached_configuration_directory caddy-directory:slave-with-cache-configuration
-    key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration
-    key kedifa_updater :kedifa-updater
-    key kedifa_updater_mapping_file :kedifa-updater-mapping-file
-    key kedifa_updater_state_file :kedifa-updater-state-file
-    key kedifa_csr :kedifa-csr
+    key backend_client_caucase_url :backend-client-caucase-url
+    import urlparse_module urlparse
     key caddy_executable :caddy_executable
-    key caucase_url :caucase_url
-    key directory_csr_id directory:csr_id
-    key directory_caddy_csr_id directory:caddy-csr_id
-    key directory_tmp directory:tmp
-    key directory_caddy_csr_id_log directory:caddy-csr_id-log
-    key certificate_organization kedifa-login-csr:organization
-    key certificate_organizational_unit kedifa-login-csr:organizational_unit
-    key csr_id_csr caucase-updater-csr:csr
-    key csr_crl kedifa-login-config:crl
-    key csr_cas_ca_certificate kedifa-login-config:cas-ca-certificate
     key http_port configuration:plain_http_port
     key https_port configuration:port
     key public_ipv4 configuration:public-ipv4
     key slave_instance_list :slave_instance_list
     key extra_slave_instance_list :extra_slave_instance_list
     key master_key_download_url :master_key_download_url
-    key slave_kedifa_information :slave_kedifa_information
     key autocert caddy-directory:autocert
     key master_certificate caddy-configuration:master-certificate
     key caddy_log_directory caddy-directory:slave-log
-    key caddy_log_cache_direct_directory caddy-directory:slave-log-cache-direct
+    key expose_csr_id_organization :organization
+    key expose_csr_id_organizational_unit :organizational-unit
     key local_ipv4 :local_ipv4
     key local_ipv6 :local_ipv6
     key global_ipv6 slap-network-information:global-ipv6
     key empty_template software-release-path:template-empty
     key template_default_slave_configuration software-release-path:template-default-slave-virtualhost
-    key template_cached_slave_configuration software-release-path:template-cached-slave-virtualhost
     key software_type :software_type
     key frontend_lazy_graceful_reload frontend-caddy-lazy-graceful:rendered
     key frontend_graceful_reload caddy-configuration:frontend-graceful-command
     section frontend_configuration frontend-configuration
     section caddy_configuration caddy-configuration
     key monitor_base_url monitor-instance-parameter:monitor-base-url 
-    key report_directory directory:bin
     key bin_directory :bin_directory
     key enable_http2_by_default configuration:enable-http2-by-default
     key global_disable_http2 configuration:global-disable-http2
     key ciphers configuration:ciphers
-    key request_timeout configuration:request-timeout
-    key proxy_try_duration configuration:proxy-try-duration
-    key proxy_try_interval configuration:proxy-try-interval
     key access_log caddy-configuration:access-log
     key error_log caddy-configuration:error-log
     key sixtunnel_executable :sixtunnel_executable
-    key service_directory directory:service
-    key run_directory directory:etc-run
     key not_found_file caddy-configuration:not-found-file
     key custom_ssl_directory caddy-directory:custom-ssl-directory
+    section kedifa_configuration kedifa-configuration
 # BBB: SlapOS Master non-zero knowledge BEGIN
-    key bbb_ssl_directory directory:bbb-ssl-dir
     key apache_certificate apache-certificate:rendered
 # BBB: SlapOS Master non-zero knowledge END
+## backend haproxy
+    key template_backend_haproxy_configuration software-release-path:template-backend-haproxy-configuration
+    section backend_haproxy_configuration backend-haproxy-configuration
+## full configuration
+    section configuration configuration
 
 # Deploy Caddy Frontend with Jinja power
 [dynamic-caddy-frontend-template]
@@ -288,9 +331,6 @@ extra-context =
     key master_certificate caddy-configuration:master-certificate
     key access_log caddy-configuration:access-log
     key slave_configuration_directory caddy-directory:slave-configuration
-    key cached_port caddy-configuration:cache-through-port
-    key ssl_cached_port caddy-configuration:ssl-cache-through-port
-    key slave_with_cache_configuration_directory caddy-directory:slave-with-cache-configuration
     section frontend_configuration frontend-configuration
     key http_port configuration:plain_http_port
     key https_port configuration:port
@@ -343,11 +383,9 @@ command = ln -sf  {{ parameter_dict['template_not_found_html'] }} ${caddy-direct
 recipe = slapos.cookbook:mkdirectory
 document-root = ${directory:srv}/htdocs
 slave-configuration = ${directory:etc}/caddy-slave-conf.d/
-slave-with-cache-configuration = ${directory:etc}/caddy-slave-with-cache-conf.d/
 cache = ${directory:var}/cache
 mod-ssl = ${:cache}/httpd_mod_ssl
 slave-log = ${directory:log}/httpd
-slave-log-cache-direct = ${directory:log}/httpd-cache-direct
 autocert = ${directory:srv}/autocert
 master-autocert-dir = ${:autocert}/master-autocert
 custom-ssl-directory = ${:slave-configuration}/ssl
@@ -362,8 +400,6 @@ not-found-file = ${caddy-directory:document-root}/${not-found-html:filename}
 master-certificate = ${caddy-directory:master-autocert-dir}/master.pem
 # Communication with ATS
 cache-port = ${trafficserver-variable:input-port}
-cache-through-port = 26011
-ssl-cache-through-port = 26012
 
 # BBB: SlapOS Master non-zero knowledge BEGIN
 [get-self-signed-fallback-access]
@@ -389,7 +425,7 @@ rendered = ${directory:bbb-ssl-dir}/frontend.crt
 <= logrotate-entry-base
 name = caddy
 log = ${caddy-configuration:error-log} ${caddy-configuration:access-log}
-rotate-num = 30
+rotate-num = ${configuration:rotate-num}
 # Note: Slaves do not define their own reload, as this would be repeated,
 #       because sharedscripts work per entry, and each slave needs its own
 #       olddir
@@ -415,9 +451,6 @@ reload-path = ${directory:etc-run}/trafficserver-reload
 local-ip = {{ instance_parameter['ipv4-random'] }}
 input-port = 23432
 hostname = ${configuration:frontend-name}
-remap = map /HTTPS/ http://{{ instance_parameter['ipv4-random'] }}:${caddy-configuration:ssl-cache-through-port}
-  map / http://{{ instance_parameter['ipv4-random'] }}:${caddy-configuration:cache-through-port}
-
 plugin-config =
 ip-allow-config = src_ip=0.0.0.0-255.255.255.255 action=ip_allow
 cache-path = ${trafficserver-directory:cache-path}
@@ -475,11 +508,18 @@ template = {{ parameter_dict['template_trafficserver_logging_config'] }}
 filename = logging.config
 
 [trafficserver-remap-config]
-< = trafficserver-jinja2-template-base
-template = {{ parameter_dict['template_empty'] }}
+<= trafficserver-jinja2-template-base
+{%- raw %}
+template = inline:
+  map /HTTPS/ http://{{ ipv4 }}:{{ https_port }}
+  map / http://{{ ipv4 }}:{{ http_port }}
+{%- endraw %}
+extra-context =
+  raw ipv4 {{ instance_parameter['ipv4-random'] }}
+  key https_port backend-haproxy-configuration:https-port
+  key http_port backend-haproxy-configuration:http-port
+
 filename = remap.config
-context =
-    key content trafficserver-variable:remap
 
 [trafficserver-plugin-config]
 < = trafficserver-jinja2-template-base
@@ -547,7 +587,7 @@ template = {{ parameter_dict['template_configuration_state_script'] }}
 rendered = ${directory:bin}/${:_buildout_section_name_}
 mode = 0700
 
-path_list = ${caddy-configuration:frontend-configuration} ${frontend-configuration:log-access-configuration} ${caddy-directory:slave-configuration}/*.conf ${caddy-directory:slave-with-cache-configuration}/*.conf ${caddy-directory:master-autocert-dir}/*.key ${caddy-directory:master-autocert-dir}/*.crt ${caddy-directory:master-autocert-dir}/*.pem ${caddy-directory:autocert}/*.pem ${caddy-directory:custom-ssl-directory}/*.proxy_ca_crt ${directory:bbb-ssl-dir}/*.crt
+path_list = ${caddy-configuration:frontend-configuration} ${frontend-configuration:log-access-configuration} ${caddy-directory:slave-configuration}/*.conf ${caddy-directory:master-autocert-dir}/*.key ${caddy-directory:master-autocert-dir}/*.crt ${caddy-directory:master-autocert-dir}/*.pem ${caddy-directory:autocert}/*.pem ${caddy-directory:custom-ssl-directory}/*.proxy_ca_crt ${directory:bbb-ssl-dir}/*.crt
 sha256sum = {{ parameter_dict['sha256sum'] }}
 
 extra-context =
@@ -579,9 +619,10 @@ template = {{ parameter_dict['template_validate_script'] }}
 rendered = ${directory:bin}/frontend-caddy-validate
 mode = 0700
 last_state_file = ${directory:run}/caddy_configuration_last_state
+validate_command = ${caddy-wrapper:rendered} -validate
 extra-context =
-    key wrapper caddy-wrapper:rendered
-    key caddy_configuration_state frontend-caddy-configuration-state-validate:rendered
+    key validate_command :validate_command
+    key configuration_state_command frontend-caddy-configuration-state-validate:rendered
     key last_state_file :last_state_file
 
 [frontend-caddy-lazy-graceful]
@@ -642,19 +683,146 @@ name = caddy_frontend_ipv6_http.py
 config-hostname = {{ instance_parameter['ipv6-random'] }}
 config-port = ${configuration:plain_http_port}
 
-[promise-caddy-frontend-cached]
+[promise-backend-haproxy-http]
 <= monitor-promise-base
 module = check_port_listening
-name = caddy_cached.py
+name = backend_haproxy_http.py
 config-hostname = {{ instance_parameter['ipv4-random'] }}
-config-port = ${caddy-configuration:cache-through-port}
+config-port = ${backend-haproxy-configuration:http-port}
 
-[promise-caddy-frontend-ssl-cached]
+[promise-backend-haproxy-https]
 <= monitor-promise-base
 module = check_port_listening
-name = caddy_ssl_cached.py
+name = backend_haproxy_https.py
 config-hostname = {{ instance_parameter['ipv4-random'] }}
-config-port = ${caddy-configuration:ssl-cache-through-port}
+config-port = ${backend-haproxy-configuration:https-port}
+
+[backend-haproxy-configuration]
+file = ${directory:etc}/backend-haproxy.cfg
+pid-file = ${directory:run}/backend-haproxy.pid
+log-socket = ${backend-haproxy-rsyslogd-config:log-socket}
+graceful-command = ${backend-haproxy-validate:rendered} && kill -USR2 $(cat ${:pid-file})
+http-port = ${configuration:backend-haproxy-http-port}
+https-port = ${configuration:backend-haproxy-https-port}
+# Caucase related configuration
+caucase-url = {{ slapparameter_dict['backend-client-caucase-url'] }}
+ca-certificate = ${backend-client-login-config:ca-certificate}
+certificate = ${backend-client-login-config:certificate}
+cas-ca-certificate = ${backend-client-login-config:cas-ca-certificate}
+csr = ${backend-client-caucase-updater-csr:csr}
+crl = ${backend-client-login-config:crl}
+
+[backend-haproxy]
+recipe = slapos.cookbook:wrapper
+command-line = {{ parameter_dict['haproxy_executable'] }} -f ${backend-haproxy-configuration:file}
+wrapper-path = ${directory:service}/backend-haproxy
+hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
+
+[backend-haproxy-rsyslogd-lazy-graceful]
+< = jinja2-template-base
+template = {{ parameter_dict['template_caddy_lazy_script_call'] }}
+rendered = ${directory:bin}/backend-haproxy-rsyslogd-lazy-graceful
+mode = 0700
+pid-file = ${directory:run}/backend-haproxy-rsyslogd-lazy-graceful.pid
+wait_time = 60
+extra-context =
+    key pid_file :pid-file
+    key wait_time :wait_time
+    key lazy_command backend-haproxy-rsyslogd-config:graceful-command
+
+[logrotate-entry-backend-haproxy]
+<= logrotate-entry-base
+name = backend-haproxy
+log = ${backend-haproxy-rsyslogd-config:log-file}
+rotate-num = ${configuration:rotate-num}
+# Note: Slaves do not define their own reload, as this would be repeated,
+#       because sharedscripts work per entry, and each slave needs its own
+#       olddir
+#       Here we trust that there will be something to be rotated with error
+#       or access log, and that this will trigger postrotate script.
+post = ${backend-haproxy-rsyslogd-lazy-graceful:rendered} &
+
+[backend-haproxy-configuration-state]
+<= jinja2-template-base
+template = {{ parameter_dict['template_configuration_state_script'] }}
+rendered = ${directory:bin}/${:_buildout_section_name_}
+mode = 0700
+
+path_list = ${backend-haproxy-configuration:file} ${backend-client-login-config:certificate}
+sha256sum = {{ parameter_dict['sha256sum'] }}
+
+extra-context =
+    key path_list :path_list
+    key sha256sum :sha256sum
+    key signature_file :signature_file
+
+[backend-haproxy-configuration-state-graceful]
+<= backend-haproxy-configuration-state
+signature_file = ${directory:run}/backend_haproxy_graceful_configuration_state_signature
+
+[backend-haproxy-configuration-state-validate]
+<= backend-haproxy-configuration-state
+signature_file = ${directory:run}/backend_haproxy_validate_configuration_state_signature
+
+[backend-haproxy-graceful]
+< = jinja2-template-base
+template = {{ parameter_dict['template_graceful_script'] }}
+rendered = ${directory:etc-run}/backend-haproxy-safe-graceful
+mode = 0700
+
+extra-context =
+    key graceful_reload_command backend-haproxy-configuration:graceful-command
+    key caddy_configuration_state backend-haproxy-configuration-state-graceful:rendered
+
+[backend-haproxy-validate]
+<= jinja2-template-base
+template = {{ parameter_dict['template_validate_script'] }}
+rendered = ${directory:bin}/backend-haproxy-validate
+mode = 0700
+last_state_file = ${directory:run}/backend_haproxy_configuration_last_state
+validate_command = {{ parameter_dict['haproxy_executable'] }} -f ${backend-haproxy-configuration:file} -c
+extra-context =
+    key validate_command :validate_command
+    key configuration_state_command backend-haproxy-configuration-state-validate:rendered
+    key last_state_file :last_state_file
+
+[promise-backend-haproxy-configuration]
+<= monitor-promise-base
+module = validate_frontend_configuration
+name = backend-haproxy-configuration.py
+config-verification-script = ${promise-backend-haproxy-configuration-helper:rendered}
+
+[promise-backend-haproxy-configuration-helper]
+< = jinja2-template-base
+template = {{ parameter_dict['template_empty'] }}
+rendered = ${directory:bin}/backend-haproxy-read-last-configuration-state
+mode = 0700
+content =
+  #!/bin/sh
+  exit `cat ${backend-haproxy-validate:last_state_file}`
+context =
+    key content :content
+
+[backend-haproxy-rsyslogd-config]
+log-socket = ${directory:run}/bhlog.sck
+log-file = ${directory:log}/backend-haproxy.log
+pid-file = ${directory:run}/backend-haproxy-rsyslogd.pid
+spool-directory = ${directory:backend-haproxy-rsyslogd-spool}
+graceful-command = kill -HUP $(cat ${:pid-file})
+caddy-log-directory = ${caddy-directory:slave-log}
+
+[backend-haproxy-rsyslogd-configuration]
+<= jinja2-template-base
+template = ${software-release-path:template-backend-haproxy-rsyslogd-conf}
+rendered = ${directory:etc}/backend-haproxy-rsyslogd.conf
+extra-context =
+  section configuration backend-haproxy-rsyslogd-config
+
+[backend-haproxy-rsyslogd]
+recipe = slapos.cookbook:wrapper
+command-line = {{ parameter_dict['rsyslogd_executable'] }} -i ${backend-haproxy-rsyslogd-config:pid-file} -n -f ${backend-haproxy-rsyslogd-configuration:rendered}
+wrapper-path = ${directory:service}/backend-haproxy-rsyslogd
+hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 #######
 # Monitoring sections

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

 {% if slap_software_type in software_type %}
+{% set aibcc_enabled = True %}
 {% import "caucase" as caucase with context %}
 {#- SERVER_POLLUTED_KEY_LIST is a list of keys which comes from various SlapOS Master implementations, which mix request and publish keys on each slave information -#}
 {%- set SERVER_POLLUTED_KEY_LIST = ['connection-parameter-hash', 'timestamp', 'slave_title', 'slap_software_type'] -%}
 {%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%}
 {%- set GOOD_CIPHER_LIST = ['ECDHE-ECDSA-AES256-GCM-SHA384', 'ECDHE-RSA-AES256-GCM-SHA384', 'ECDHE-ECDSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-ECDSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-WITH-CHACHA20-POLY1305', 'ECDHE-RSA-AES256-CBC-SHA', 'ECDHE-RSA-AES128-CBC-SHA', 'ECDHE-ECDSA-AES256-CBC-SHA', 'ECDHE-ECDSA-AES128-CBC-SHA', 'RSA-AES256-CBC-SHA', 'RSA-AES128-CBC-SHA', 'ECDHE-RSA-3DES-EDE-CBC-SHA', 'RSA-3DES-EDE-CBC-SHA'] %}
 {% set aikc_enabled = slapparameter_dict.get('automatic-internal-kedifa-caucase-csr', 'true').lower() in TRUE_VALUES %}
+{% set aibcc_enabled = slapparameter_dict.get('automatic-internal-backend-client-caucase-csr', 'true').lower() in TRUE_VALUES %}
 {# Ports 8401, 8402 and 8410+1..N are reserved for monitor ports on various partitions #}
 {% set master_partition_monitor_monitor_httpd_port = 8401 %}
 {% set kedifa_partition_monitor_httpd_port = 8402 %}
 {% set frontend_monitor_httpd_base_port = 8410 %}
+{% set caucase_host = '[' ~ instance_parameter['ipv6-random'] ~ ']' %}
+{% set caucase_netloc = caucase_host ~ ':' ~ instance_parameter['configuration.caucase_backend_client_port'] %}
+{% set caucase_url = 'http://' ~ caucase_netloc %}
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/${:filename}
@@ -64,6 +69,7 @@ context =
 {%     endif %}
 {%   endfor %}
 {%   do config_dict.__setitem__('monitor-httpd-port', frontend_monitor_httpd_base_port + i) %}
+{%   do config_dict.__setitem__('backend-client-caucase-url', caucase_url) %}
 {%   do frontend_list.append(frontend_name) %}
 {%   do frontend_section_list.append(request_section_title) %}
 {%   do part_list.append(request_section_title) %}
@@ -131,18 +137,18 @@ context =
 {%     endfor %}
 {%     do slave.__setitem__('server-alias', ' '.join(slave_server_alias_unclashed)) %}
 {%   endif %}
-{%   if slave.get('url') %}
-{%     if subprocess_module.call([caddy_backend_url_validator, '' ~ slave['url']]) == 1 %}
-{%       do slave_error_list.append('slave url %r invalid' % (slave['url'],)) %}
+{%   for url_key in ['url', 'https-url'] %}
+{%     if url_key in slave %}
+{%       set url = (slave[url_key] or '').strip() %}
+{%       if subprocess_module.call([caddy_backend_url_validator, url]) == 1 or not validators.url(url) %}
+{%         do slave_error_list.append('slave %s %r invalid' % (url_key, url)) %}
+{%       elif url != slave[url_key] %}
+{%         do slave_warning_list.append('slave %s %r has been converted to %r' % (url_key, slave[url_key], url)) %}
 {%       endif %}
 {%     endif %}
-{%   if slave.get('https-url') %}
-{%     if subprocess_module.call([caddy_backend_url_validator, '' ~ slave['https-url']]) == 1 %}
-{%       do slave_error_list.append('slave https-url %r invalid' % (slave['https-url'],)) %}
-{%     endif %}
-{%   endif %}
-{%   set ssl_proxy_ca_crt = slave.get('ssl_proxy_ca_crt') %}
-{%   if ssl_proxy_ca_crt %}
+{%   endfor %}
+{%   if 'ssl_proxy_ca_crt' in slave %}
+{%     set ssl_proxy_ca_crt = slave.get('ssl_proxy_ca_crt', '') %}
 {%     set check_popen = popen([parameter_dict['openssl'], 'x509', '-noout']) %}
 {%     do check_popen.communicate(ssl_proxy_ca_crt) %}
 {%     if check_popen.returncode != 0 %}
@@ -213,7 +219,7 @@ software-url = {{ slapparameter_dict.pop(frontend_software_url_key) }}
 software-url = ${slap-connection:software-release-url}
 {% endif %}
 software-type = {{frontend_type}}
-return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url csr_id-url csr_id-certificate
+return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url backend-client-csr_id-url csr_id-url csr_id-certificate
 
 {% for section, frontend_request in request_dict.iteritems() %}
 {%   set state = frontend_request.get('state', '') %}
@@ -225,6 +231,7 @@ state = {{ state }}
 {%   endif %}
 config-slave-kedifa-information = ${request-kedifa:connection-slave-kedifa-information}
 config-kedifa-caucase-url = ${request-kedifa:connection-caucase-url}
+config-backend-client-caucase-url = {{ caucase_url }}
 config-master-key-download-url = ${request-kedifa:connection-master-key-download-url}
 config-cluster-identification = {{ cluster_identification }}
 {#   Do not send additional parameters for destroyed nodes #}
@@ -259,6 +266,7 @@ domain = {{ slapparameter_dict.get('domain') }}
 slave-amount = {{ slave_instance_list | length }}
 accepted-slave-amount = {{ authorized_slave_list | length }}
 rejected-slave-amount = {{ rejected_slave_dict | length }}
+backend-client-caucase-url = {{ caucase_url }}
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 rejected-slave-dict = {{ dumps(json_module.dumps(rejected_slave_title_dict, sort_keys=True)) }}
 rejected-slave-promise-url = ${rejected-slave-promise:config-url}
@@ -273,13 +281,24 @@ warning-list = {{ dumps(json_module.dumps(warning_list, sort_keys=True)) }}
 {# sort_keys are important in order to avoid shuffling parameters on each run #}
 warning-slave-dict = {{ dumps(json_module.dumps(warning_slave_dict, sort_keys=True)) }}
 {% endif %}
+{% if not aikc_enabled or not aibcc_enabled %}
+{% for frontend in frontend_list %}
+  {% set section_part = '${request-' + frontend %}
+{{ frontend }}-csr_id-certificate = {{ section_part }}:connection-csr_id-certificate}
+{% endfor %}
+{% endif %}
 {% if not aikc_enabled %}
 kedifa-csr_id-url = ${request-kedifa:connection-csr_id-url}
 kedifa-csr_id-certificate = ${request-kedifa:connection-csr_id-certificate}
 {% for frontend in frontend_list %}
   {% set section_part = '${request-' + frontend %}
 {{ frontend }}-csr_id-url = {{ section_part }}:connection-csr_id-url}
-{{ frontend }}-csr_id-certificate = {{ section_part }}:connection-csr_id-certificate}
+{% endfor %}
+{% endif %}
+{% if not aibcc_enabled %}
+{% for frontend in frontend_list %}
+  {% set section_part = '${request-' + frontend %}
+{{ frontend }}-backend-client-csr_id-url = {{ section_part }}:connection-backend-client-csr_id-url}
 {% endfor %}
 {% endif %}
 
@@ -371,12 +390,17 @@ kedifa = ${request-kedifa:connection-monitor-base-url}
 {{ frontend }} = {{ '${' + frontend + ':connection-monitor-base-url}' }}
 {% endfor %}
 
-{% if aikc_enabled %}
 [directory]
 recipe = slapos.cookbook:mkdirectory
-
 bin = ${buildout:directory}/bin/
 srv = ${buildout:directory}/srv/
+backup = ${:srv}/backup
+# CAUCASE directories
+caucased = ${:srv}/caucased
+backup-caucased = ${:backup}/caucased
+
+{% if aikc_enabled %}
+[directory]
 aikc = ${:srv}/aikc
 
 [aikc-config]
@@ -505,7 +529,140 @@ command =
   ${aikc-{{ csr }}-wrapper:rendered}
 update-command = ${:command}
 {% endfor %}
-{% endif %}
+{% endif %} {# if aikc_enabled #}
+
+{% if aibcc_enabled %}
+[directory]
+aibcc = ${:srv}/aibcc
+
+[aibcc-config]
+caucase-url = {{ caucase_url }}
+
+csr = ${directory:aibcc}/csr.pem
+key = ${directory:aibcc}/key.pem
+ca-certificate = ${directory:aibcc}/cas-ca-certificate.pem
+crl = ${directory:aibcc}/crl.pem
+user-ca-certificate = ${directory:aibcc}/user-ca-certificate.pem
+user-crl = ${directory:aibcc}/user-crl.pem
+user-created = ${directory:aibcc}/user-created
+csr_id = ${directory:aibcc}/csr_id
+
+[aibcc-user-csr]
+recipe = plone.recipe.command
+organization = {{ cluster_identification }}
+organizational_unit = Automatic Sign Backend Client Caucase CSR
+command =
+  if [ ! -f ${:csr} ] && [ ! -f ${:key} ]  ; then
+    {{ parameter_dict['openssl'] }} req -new -sha256 \
+      -newkey rsa:2048 -nodes -keyout ${:key} \
+      -subj "/O=${:organization}/OU=${:organizational_unit}" \
+      -out ${:csr}
+  fi
+update-command = ${:command}
+csr = ${aibcc-config:csr}
+key = ${aibcc-config:key}
+stop-on-error = True
+
+
+[aibcc-caucase-wrapper]
+{# jinja2 instead of wrapper is used with context to remove py'u' #}
+recipe = slapos.recipe.template:jinja2
+context =
+  key caucase_url aibcc-config:caucase-url
+template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
+  exec {{ parameter_dict['bin_directory'] }}/caucase \
+{# raw block to use context #}
+{% raw %}
+  --ca-url {{ caucase_url }} \
+{% endraw %}
+  --ca-crt ${aibcc-config:ca-certificate} \
+  --user-ca-crt ${aibcc-config:user-ca-certificate} \
+  --user-crl ${aibcc-config:user-crl} \
+  --crl ${aibcc-config:crl} \
+  "$@"
+
+rendered = ${directory:bin}/aibcc-caucase-wrapper
+mode = 0700
+
+{% do part_list.append('aibcc-create-user') %}
+[aibcc-create-user]
+recipe = plone.recipe.command
+# the caucase for this part is provided in this profile, so we can't fail
+# as otherwise caucase will never be started...
+stop-on-error = False
+update-command = ${:command}
+command =
+  if ! [ -f ${aibcc-config:user-created} ] ; then
+    ${aibcc-caucase-wrapper:rendered} --mode user --send-csr ${aibcc-user-csr:csr} > ${aibcc-config:csr_id} || exit 1
+    cut -d ' ' -f 1 ${aibcc-config:csr_id} || exit 1
+    csr_id=`cut -d ' ' -f 1 ${aibcc-config:csr_id}`
+    sleep 1
+    ${aibcc-caucase-wrapper:rendered} --mode user --get-crt $csr_id ${aibcc-config:key} || exit 1
+    touch ${aibcc-config:user-created}
+  fi
+
+{% do part_list.append('aibcc-user-caucase-updater') %}
+{% do part_list.append('aibcc-user-caucase-updater-promise') %}
+{{ caucase.updater(
+     prefix='aibcc-user-caucase-updater',
+     buildout_bin_directory=parameter_dict['bin_directory'],
+     updater_path='${directory:service}/aibcc-user-caucase-updater',
+     url='${aibcc-config:caucase-url}',
+     data_dir='${directory:srv}/caucase-updater',
+     crt_path='${aibcc-config:key}',
+     ca_path='${aibcc-config:user-ca-certificate}',
+     crl_path='${aibcc-config:user-crl}',
+     key_path='${aibcc-config:key}',
+     mode='user',
+)}}
+
+[aibcc-check-certificate]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:bin}/aibcc-check-certificate
+template = inline:
+  import sys
+  import ssl
+  import urlparse
+  certificate = sys.argv[2]
+  parsed = urlparse.urlparse(sys.argv[1])
+  got_certificate = ssl.get_server_certificate((parsed.hostname, parsed.port))
+  sys.exit(0) if certificate.strip() == got_certificate.strip() else sys.exit(1)
+
+{% for csr in frontend_list %}
+[aibcc-{{ csr }}-wrapper]
+{# jinja2 instead of wrapper is used with context to remove py'u' #}
+recipe = slapos.recipe.template:jinja2
+context =
+  key csr_id_url request-{{ csr }}:connection-backend-client-csr_id-url
+  key csr_id_certificate request-{{ csr }}:connection-csr_id-certificate
+template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
+  test -f ${directory:aibcc}/{{ csr }}-done && exit 0
+  ${buildout:executable} ${aibcc-check-certificate:rendered} \
+{# raw block to use context #}
+{% raw %}
+  {{ csr_id_url }} \
+  """{{ csr_id_certificate }}"""
+{% endraw %}
+  if [ $? = 0 ]; then
+    csr_id=`{{ parameter_dict['curl'] }}/bin/curl -s -k -g \
+{% raw %}
+  {{ csr_id_url }} \
+{% endraw %}
+  ` || exit 1
+    ${aibcc-caucase-wrapper:rendered} --user-key ${aibcc-config:key} --sign-csr $csr_id && touch ${directory:aibcc}/{{ csr }}-done
+  fi
+rendered = ${directory:bin}/aibcc-{{ csr }}-wrapper
+mode = 0700
+
+{% do part_list.append('aibcc-%s' % (csr,)) %}
+[aibcc-{{ csr }}]
+recipe = plone.recipe.command
+stop-on-error = True
+command =
+  ${aibcc-{{ csr }}-wrapper:rendered}
+update-command = ${:command}
+{% endfor %}
+{% endif %} {# if aibcc_enabled #}
 
 [rejected-slave-json]
 recipe = slapos.recipe.template:jinja2
@@ -599,6 +756,20 @@ config-filename = ${rejected-slave-json:rendered}
 config-state = empty
 config-url = ${rejected-slave-publish:url}
 
+[caucased-backend-client]
+hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
+{{  caucase.caucased(
+      prefix='caucased-backend-client',
+      buildout_bin_directory=parameter_dict['bin_directory'],
+      caucased_path='${directory:service}/caucased-backend-client',
+      backup_dir='${directory:backup-caucased}',
+      data_dir='${directory:caucased}',
+      netloc=caucase_netloc,
+      service_auto_approve_count=0,
+      user_auto_approve_count=1,
+      key_len=2048,
+)}}
+
 [buildout]
 extends =
   {{ common_profile }}
@@ -610,6 +781,8 @@ parts =
   request-kedifa
   rejected-slave-promise
   promise-rejected-slave-publish-ip-port
+  caucased-backend-client
+  caucased-backend-client-promise
 {% for part in part_list %}
 {{ '  %s' % part }}
 {% endfor %}

software/caddy-frontend/instance-caddy-input-schema.json

@@ -66,16 +66,16 @@
       "title": "Test Verification URL",
       "type": "string"
     },
-    "proxy-try-duration": {
+    "backend-connect-timeout": {
       "default": 5,
-      "description": "A time during which Caddy will try to establish connection with a backend. Setting it to 0 will result with immediate return of 502 EOF error to the browser, even if it would be possible to (re)connect to the backend during few moments. More info in https://caddyserver.com/docs/proxy try_durtion.",
-      "title": "Duration in seconds of trying a backend",
+      "description": "Time in seconds for establishing connection to the backend.",
+      "title": "Timeout for backend connection (seconds)",
       "type": "integer"
     },
-    "proxy-try-interval": {
-      "default": 250,
-      "description": "How often Caddy will try to establish connection with a backend during proxy-try-duration. More info in https://caddyserver.com/docs/proxy try_interval",
-      "title": "Interval in milliseconds of tries during proxy-try-duration",
+    "backend-connect-retries": {
+      "default": 3,
+      "description": "Amount of retries to connect to the backend. The amount of backend-connect-timeout*backend-connect-retries seconds will be spent to connect to the backend.",
+      "title": "Amount of retries to connect to the backend.",
       "type": "integer"
     },
     "automatic-internal-kedifa-caucase-csr": {
@@ -88,6 +88,16 @@
       "title": "Automatic Internal KeDiFa's Caucase CSR",
       "type": "string"
     },
+    "automatic-internal-backend-client-caucase-csr": {
+      "default": "true",
+      "description": "Automatically signs CSRs sent to Backend Client's caucase, based on csr_id and matching certificate.",
+      "enum": [
+        "true",
+        "false"
+      ],
+      "title": "Automatic Internal Backend Client's Caucase CSR",
+      "type": "string"
+    },
     "ciphers": {
       "description": "List of ciphers. Empty defaults to Caddy list of ciphers. See https://caddyserver.com/docs/tls for more information.",
       "title": "Ordered space separated list of ciphers",
@@ -98,6 +108,16 @@
       "description": "Timeout for HTTP requests.",
       "title": "HTTP Request timeout in seconds",
       "type": "integer"
+    },
+    "authenticate-to-backend": {
+      "default": "false",
+      "description": "If set to true the frontend certificate will be used as authentication certificate to the backend. Note: backend might have to know the frontend CA, available with 'backend-client-caucase-url'.",
+      "enum": [
+        "false",
+        "true"
+      ],
+      "title": "Authenticate to backend",
+      "type": "string"
     }
   },
   "title": "Input Parameters",

software/caddy-frontend/instance-kedifa.cfg.in

@@ -230,7 +230,7 @@ config-ca-cert-file = ${kedifa-config:ca-certificate}
 <= logrotate-entry-base
 name = kedifa
 log = ${kedifa-config:logfile}
-rotate-num = 30
+rotate-num = {{ instance_parameter['configuration.rotate-num'] | int }}
 
 [kedifa]
 recipe = slapos.cookbook:wrapper

software/caddy-frontend/instance-output-schema.json

@@ -73,6 +73,10 @@
     "warning-list": {
       "description": "List of warning found during the request.",
       "type": "array"
+    },
+    "backend-client-caucase-url": {
+      "description": "URL to caucase used by authentication to the backend.",
+      "type": "string"
     }
   },
   "type": "object"

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

@@ -195,10 +195,34 @@
       "title": "type:zope virtualhostroot-https-port",
       "type": "integer"
     },
+    "backend-connect-timeout": {
+      "description": "Time in seconds for establishing connection to the backend.",
+      "title": "Timeout for backend connection (seconds)",
+      "type": "integer"
+    },
+    "backend-connect-retries": {
+      "description": "Amount of retries to connect to the backend. The amount of backend-connect-timeout*backend-connect-retries seconds will be spent to connect to the backend.",
+      "title": "Amount of retries to connect to the backend.",
+      "type": "integer"
+    },
+    "request-timeout": {
+      "description": "Timeout for HTTP requests.",
+      "title": "HTTP Request timeout in seconds",
+      "type": "integer"
+    },
     "ciphers": {
       "description": "List of ciphers. Empty defaults to cluster list of ciphers, which by default are Caddy list of ciphers. See https://caddyserver.com/docs/tls for more information.",
       "title": "Ordered space separated list of ciphers",
       "type": "string"
+    },
+    "authenticate-to-backend": {
+      "description": "If set to true the frontend certificate will be used as authentication certificate to the backend. Note: backend might have to know the frontend CA, available with 'backend-client-caucase-url'.",
+      "enum": [
+        "false",
+        "true"
+      ],
+      "title": "Authenticate to backend",
+      "type": "string"
     }
   },
   "title": "Input Parameters",

software/caddy-frontend/instance-slave-output-schema.json

@@ -49,6 +49,10 @@
     "kedifa-caucase-url": {
       "description": "URL to caucase used by KeDiFa",
       "type": "string"
+    },
+    "backend-client-caucase-url": {
+      "description": "URL to caucase used by authentication to the backend.",
+      "type": "string"
     }
   },
   "type": "object"

software/caddy-frontend/instance.cfg.in

@@ -103,6 +103,7 @@ configuration.nginx_port = 9443
 configuration.kedifa_port = 7879
 # Warning: Caucase takes also cacuase_port+1
 configuration.caucase_port = 8890
+configuration.caucase_backend_client_port = 8990
 configuration.apache-key =
 configuration.apache-certificate =
 configuration.open-port = 80 443
@@ -117,5 +118,9 @@ configuration.ciphers =
 configuration.request-timeout = 600
 configuration.mpm-graceful-shutdown-timeout = 5
 configuration.frontend-name =
-configuration.proxy-try-duration = 5
-configuration.proxy-try-interval = 250
+configuration.backend-connect-timeout = 5
+configuration.backend-connect-retries = 3
+configuration.backend-haproxy-http-port = 21080
+configuration.backend-haproxy-https-port = 21443
+configuration.authenticate-to-backend = False
+configuration.rotate-num = 4000

software/caddy-frontend/templates/Caddyfile.in

@@ -2,10 +2,8 @@
 
 import {{frontend_configuration.get('log-access-configuration')}}
 import {{ slave_configuration_directory }}/*.conf
-import {{ slave_with_cache_configuration_directory }}/*.conf
 
-{% for port in [https_port] %}
-:{{ port }} {
+:{{ https_port }} {
   tls {{ master_certificate }} {{ master_certificate }}
   bind {{ local_ipv4 }}
   status 404 /
@@ -17,10 +15,8 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
     * {{ not_found_file }}
   }
 }
-{%- endfor %}
 
-{% for port in [http_port, cached_port, ssl_cached_port] %}
-:{{ port }} {
+:{{ http_port }} {
   bind {{ local_ipv4 }}
   status 404 /
   log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
@@ -31,7 +27,6 @@ import {{ slave_with_cache_configuration_directory }}/*.conf
     * {{ not_found_file }}
   }
 }
-{%- endfor %}
 
 # Access to server-status Caddy-style
 https://[{{ global_ipv6 }}]:{{ https_port }}/server-status, https://{{ local_ipv4 }}:{{ https_port }}/server-status {

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

 {%- if software_type == slap_software_type %}
 {%- set kedifa_updater_mapping = [] %}
 {%- set cached_server_dict = {} %}
+{%- set backend_slave_list = [] %}
 {%- set part_list = [] %}
 {%- set cache_port = caddy_configuration.get('cache-port') %}
-{%- set cached_port = caddy_configuration.get('cache-through-port') %}
-{%- set ssl_cached_port = caddy_configuration.get('ssl-cache-through-port') %}
 {%- set cache_access = "http://%s:%s" % (local_ipv4, cache_port) %}
 {%- set ssl_cache_access = "http://%s:%s/HTTPS" % (local_ipv4, cache_port) %}
+{%- set backend_haproxy_http_url = 'http://%s:%s' % (local_ipv4, backend_haproxy_configuration['http-port']) %}
+{%- set backend_haproxy_https_url = 'http://%s:%s' % (local_ipv4, backend_haproxy_configuration['https-port']) %}
 {%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] %}
 {%- set generic_instance_parameter_dict = { 'cache_access': cache_access, 'local_ipv4': local_ipv4, 'http_port': http_port, 'https_port': https_port} %}
 {%- set slave_log_dict = {} %}
@@ -19,8 +20,8 @@
 {%- else %}
 {%-   do kedifa_updater_mapping.append(('notreadyyet', master_certificate, apache_certificate)) %}
 {%- endif %}
-{%- if slave_kedifa_information %}
-{%-   set slave_kedifa_information = json_module.loads(slave_kedifa_information) %}
+{%- if kedifa_configuration['slave_kedifa_information'] %}
+{%-   set slave_kedifa_information = json_module.loads(kedifa_configuration['slave_kedifa_information']) %}
 {%- else %}
 {%-   set slave_kedifa_information = {} %}
 {%- endif -%}
@@ -32,22 +33,20 @@ context =
     raw common_profile {{ common_profile }}
     ${:extra-context}
 
-post = {{ frontend_lazy_graceful_reload }} &
-frequency = daily
-rotatep-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
 # empty sections if no slaves are available
 [slave-log-directory-dict]
 [slave-password]
 
-# empty section if no cached slaves are available
-[slave-log-cache-direct-directory-dict]
-
 {#- Loop thought slave list to set up slaves #}
+{%- set DEFAULT_PORT = {'http': 80, 'https': 443, '': None} %}
 {%- for slave_instance in slave_instance_list %}
+{#- prepare backend parameters #}
+{%- for key, prefix in [('url', 'http_backend'), ('https-url', 'https_backend')] %}
+{%-   set parsed = urlparse_module.urlparse(slave_instance.get(key, '').strip()) %}
+{%-   set info_dict = {'scheme': parsed.scheme, 'hostname': parsed.hostname, 'port': parsed.port or DEFAULT_PORT[parsed.scheme], 'path': parsed.path, 'fragment': parsed.fragment} %}
+{%-   do slave_instance.__setitem__(prefix, info_dict) %}
+{%- endfor %}
+{%-   do slave_instance.__setitem__('ssl_proxy_verify', ('' ~ slave_instance.get('ssl-proxy-verify', '')).lower() in TRUE_VALUES) %}
 {#-   Manage ciphers #}
 {%-   set slave_ciphers = slave_instance.get('ciphers', '').strip().split() %}
 {%-   if slave_ciphers %}
@@ -56,10 +55,34 @@ create = true
 {%-     set slave_cipher_list = ciphers.strip() %}
 {%-   endif %}
 {%-   do slave_instance.__setitem__('cipher_list', slave_cipher_list) %}
+{#-   Manage common instance parameters #}
 {%-   set slave_type = slave_instance.get('type', '') %}
 {%-   set enable_cache = (('' ~ slave_instance.get('enable_cache', '')).lower() in TRUE_VALUES and slave_type != 'redirect') %}
 {%-   set slave_reference = slave_instance.get('slave_reference') %}
 {%-   set slave_kedifa = slave_kedifa_information.get(slave_reference) %}
+{#-   Setup backend URLs for front facing Caddy #}
+{%-   if slave_type == 'redirect' %}
+{%-     do slave_instance.__setitem__('backend-http-url', slave_instance.get('url', '').rstrip('/')) %}
+{%-     if slave_instance.get('https-url') %}
+{%-       do slave_instance.__setitem__('backend-https-url', slave_instance.get['https-url'].rstrip('/')) %}
+{%-     endif %}
+{%-   elif enable_cache %}
+{%-     if 'domain' in slave_instance %}
+{%-       if not slave_instance.get('custom_domain') %}
+{%-         do slave_instance.__setitem__('custom_domain', slave_instance.get('domain')) %}
+{%-       endif %}
+{%-     endif %}
+{%-     do slave_instance.__setitem__('backend-http-url', cache_access) %}
+{%-     if slave_instance.get('https-url') %}
+{%-       do slave_instance.__setitem__('backend-https-url', ssl_cache_access) %}
+{%-     endif %}
+{%-     do cached_server_dict.__setitem__(slave_reference, slave_configuration_section_name) %}
+{%-   else %}
+{%-     do slave_instance.__setitem__('backend-http-url', backend_haproxy_http_url) %}
+{%-     if slave_instance.get('https-url') %}
+{%-       do slave_instance.__setitem__('backend-https-url', backend_haproxy_https_url) %}
+{%-     endif %}
+{%-   endif %}
 {%-   if slave_kedifa %}
 {%-     set key_download_url = slave_kedifa.get('key-download-url') %}
 {%-   else %}
@@ -70,57 +93,41 @@ create = true
 {%-   set slave_publish_dict = {} %}
 {%-   set slave_configuration_section_name = 'slave-instance-%s-configuration' % slave_reference %}
 {%-   set slave_logrotate_section = slave_reference + "-logs" %}
-{%-   set slave_logrotate_cache_direct_section = slave_reference + "-cache-direct-logs" %}
 {%-   set slave_password_section = slave_reference + "-password" %}
 {%-   set slave_ln_section = slave_reference + "-ln" %}
 {#-   extend parts #}
 {%-   do part_list.extend([slave_ln_section]) %}
 {%-   do part_list.extend([slave_logrotate_section, slave_section_title]) %}
 {%-   set slave_log_folder = '${logrotate-directory:logrotate-backup}/' + slave_reference + "-logs" %}
-{%-   if enable_cache %}
-{%-     set slave_log_cache_direct_folder = '${logrotate-directory:logrotate-backup}/' + slave_logrotate_cache_direct_section %}
-{%-     do part_list.extend([slave_logrotate_cache_direct_section]) %}
-{%-   endif %}
 {#-   Pass HTTP2 switch #}
 {%-   do slave_instance.__setitem__('enable_http2_by_default', enable_http2_by_default) %}
 {%-   do slave_instance.__setitem__('global_disable_http2', global_disable_http2) %}
-{#-   Pass proxy_try_duration and proxy_try_interval #}
-{%-   do slave_instance.__setitem__('proxy_try_duration', proxy_try_duration) %}
-{%-   do slave_instance.__setitem__('proxy_try_interval', proxy_try_interval) %}
+{#-   Pass backend timeout values #}
+{%-   for key in ['backend-connect-timeout', 'backend-connect-retries', 'request-timeout', 'authenticate-to-backend'] %}
+{%-     if slave_instance.get(key, '') == '' %}
+{%-       do slave_instance.__setitem__(key, configuration[key]) %}
+{%-     endif %}
+{%-   endfor %}
+{%-   do slave_instance.__setitem__('authenticate-to-backend', ('' ~ slave_instance.get('authenticate-to-backend', '')).lower() in TRUE_VALUES) %}
 {#-   Set Up log files #}
 {%-   do slave_parameter_dict.__setitem__('access_log', '/'.join([caddy_log_directory, '%s_access_log' % slave_reference])) %}
 {%-   do slave_parameter_dict.__setitem__('error_log', '/'.join([caddy_log_directory, '%s_error_log' % slave_reference])) %}
+{%-   do slave_parameter_dict.__setitem__('backend_log', '/'.join([caddy_log_directory, '%s_backend_log' % slave_reference])) %}
 {%-   do slave_instance.__setitem__('access_log', slave_parameter_dict.get('access_log')) %}
 {%-   do slave_instance.__setitem__('error_log', slave_parameter_dict.get('error_log')) %}
-{%-   if enable_cache %}
-{%-     do slave_parameter_dict.__setitem__('access_log_cache_direct', '/'.join([caddy_log_cache_direct_directory, '%s_access_log' % slave_reference])) %}
-{%-     do slave_parameter_dict.__setitem__('error_log_cache_direct', '/'.join([caddy_log_cache_direct_directory, '%s_error_log' % slave_reference])) %}
-{%-     do slave_instance.__setitem__('access_log_cache_direct', slave_parameter_dict.get('access_log_cache_direct')) %}
-{%-     do slave_instance.__setitem__('error_log_cache_direct', slave_parameter_dict.get('error_log_cache_direct')) %}
-{%-   endif %}
+{%-   do slave_instance.__setitem__('backend_log', slave_parameter_dict.get('backend_log')) %}
 {#-   Add slave log directory to the slave log access dict #}
 {%-   do slave_log_dict.__setitem__(slave_reference, slave_log_folder) %}
 {%-   set slave_log_access_url = 'https://' + slave_reference.lower() + ':${'+ slave_password_section +':passwd}@[' + frontend_configuration.get('caddy-ipv6') + ']:' + frontend_configuration.get('caddy-https-port') + '/' + slave_reference.lower() + '/' %}
 {%-   do slave_publish_dict.__setitem__('log-access', slave_log_access_url) %}
 {%-   do slave_publish_dict.__setitem__('slave-reference', slave_reference) %}
 {%-   do slave_publish_dict.__setitem__('public-ipv4', public_ipv4) %}
+{%-   do slave_publish_dict.__setitem__('backend-client-caucase-url', backend_client_caucase_url) %}
 {#-   Set slave domain if none was defined #}
 {%-   if slave_instance.get('custom_domain', None) == None %}
 {%-     set domain_prefix = slave_instance.get('slave_reference').replace("-", "").replace("_", "").lower() %}
 {%-     do slave_instance.__setitem__('custom_domain', "%s.%s" % (domain_prefix, slapparameter_dict.get('domain'))) %}
 {%-   endif %}
-{%-   if enable_cache and 'url' in slave_instance %}
-{%-     if 'domain' in slave_instance %}
-{%-       if not slave_instance.get('custom_domain') %}
-{%-         do slave_instance.__setitem__('custom_domain', slave_instance.get('domain')) %}
-{%-       endif %}
-{%-     endif %}
-{%-     do slave_instance.__setitem__('backend_url', slave_instance.get('url')) %}
-{%-     do slave_instance.__setitem__('https_backend_url', slave_instance.get('https-url', slave_instance.get('url'))) %}
-{%-     do slave_instance.__setitem__('url', cache_access) %}
-{%-     do slave_instance.__setitem__('https-url', ssl_cache_access) %}
-{%-     do cached_server_dict.__setitem__(slave_reference, slave_configuration_section_name) %}
-{%-   endif %}
 {%-   do slave_publish_dict.__setitem__('domain', slave_instance.get('custom_domain')) %}
 {%-   do slave_publish_dict.__setitem__('url', "http://%s" % slave_instance.get('custom_domain')) %}
 {%-   do slave_publish_dict.__setitem__('site_url', "http://%s" % slave_instance.get('custom_domain')) %}
@@ -129,11 +136,6 @@ create = true
 [slave-log-directory-dict]
 {{slave_reference}} = {{ slave_log_folder }}
 
-{%-   if enable_cache %}
-[slave-log-cache-direct-directory-dict]
-{{slave_reference}}_cache_direct = {{ slave_log_cache_direct_folder }}
-{%-   endif %}
-
 [slave-password]
 {{ slave_reference }} = {{ '${' + slave_password_section + ':passwd}' }}
 
@@ -141,23 +143,17 @@ create = true
 [{{slave_logrotate_section}}]
 <= logrotate-entry-base
 name = ${:_buildout_section_name_}
-log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
+log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}} {{slave_parameter_dict.get('backend_log')}}
 backup = {{ slave_log_folder }}
-{%-   if enable_cache %}
-
-[{{slave_logrotate_cache_direct_section}}]
-<= logrotate-entry-base
-name = ${:_buildout_section_name_}
-log = {{slave_parameter_dict.get('access_log_cache_direct')}} {{slave_parameter_dict.get('error_log_cache_direct')}}
-backup = {{ slave_log_cache_direct_folder }}
-{%-   endif %}
+rotate-num = {{ dumps('' ~ configuration['rotate-num']) }}
 
 {#-   integrate current logs inside #}
 
 [{{slave_ln_section}}]
 recipe = plone.recipe.command
 stop-on-error = false
-command = ln -s {{slave_parameter_dict.get('error_log')}} {{ slave_log_folder }}/error.log && ln -s {{slave_parameter_dict.get('access_log')}} {{ slave_log_folder }}/access.log
+update-command = ${:command}
+command = ln -sf {{slave_parameter_dict.get('error_log')}} {{ slave_log_folder }}/error.log && ln -sf {{slave_parameter_dict.get('access_log')}} {{ slave_log_folder }}/access.log && ln -sf {{slave_parameter_dict.get('backend_log')}} {{ slave_log_folder }}/backend.log
 
 {#-   Set password for slave #}
 
@@ -196,7 +192,7 @@ value = {{ dumps(slave_instance.get(cert_name)) }}
 {#-   Set Up Certs #}
 {%-   if 'ssl_key' in slave_instance and 'ssl_crt' in slave_instance %}
 {%-     set cert_title = '%s-crt' % (slave_reference) %}
-{%-     set cert_file = '/'.join([bbb_ssl_directory, cert_title.replace('-','.')]) %}
+{%-     set cert_file = '/'.join([directory['bbb-ssl-dir'], cert_title.replace('-','.')]) %}
 {%-     do kedifa_updater_mapping.append((key_download_url, certificate, cert_file)) %}
 {%-     do part_list.append(cert_title) %}
 {%-     do slave_parameter_dict.__setitem__("ssl_crt", cert_file) %}
@@ -221,9 +217,6 @@ certificate = {{ certificate }}
 https_port = {{ dumps('' ~ https_port) }}
 http_port = {{ dumps('' ~ http_port) }}
 local_ipv4 = {{ dumps('' ~ local_ipv4) }}
-cached_port = {{ dumps('' ~ cached_port) }}
-ssl_cached_port = {{ ('' ~ ssl_cached_port) }}
-request_timeout = {{ ('' ~ request_timeout) }}
 {%-   for key, value in slave_instance.iteritems() %}
 {%-     if value is not none %}
 {{ key }} = {{ dumps('' ~ value) }}
@@ -282,6 +275,9 @@ recipe = slapos.cookbook:publish
 {%-   else %}
 {%-     do slave_instance_information_list.append(slave_publish_dict) %}
 {%-   endif %}
+{%-  if slave_type != 'redirect' %}
+{%-    do backend_slave_list.append(slave_instance) %}
+{%-  endif %}
 {%- endfor %} {# Slave iteration ends for slave_instance in slave_instance_list #}
 
 [slave-log-directories]
@@ -290,34 +286,15 @@ recipe = slapos.cookbook:mkdirectory
 
 {%- do part_list.append('slave-log-directories') %}
 
-[slave-log-cache-direct-directories]
-<= slave-log-cache-direct-directory-dict
-recipe = slapos.cookbook:mkdirectory
-
-{%- do part_list.append('slave-log-cache-direct-directories') %}
 {%- do part_list.append('caddy-log-access') %}
 {#- ############################################## #}
 {#- ## Prepare virtualhost for slaves using cache  #}
-{%- for slave_reference, slave_configuration_section_name in cached_server_dict.iteritems() %}
-{%-   set cached_slave_configuration_section_title = '%s-cached-virtualhost' % slave_reference %}
-{%-   do part_list.append(cached_slave_configuration_section_title) %}
-
-[{{ cached_slave_configuration_section_title }}]
-< = jinja2-template-base
-template = {{ template_cached_slave_configuration }}
-filename = {{ '%s.conf' % slave_reference }}
-rendered = {{ caddy_cached_configuration_directory }}/${:filename}
-extensions = jinja2.ext.do
-extra-context =
-    section slave_parameter {{ slave_configuration_section_name }}
-{{ '\n' }}
-{%- endfor %}
 {#- Define IPv6 to IPV4 tunneling #}
 [tunnel-6to4-base]
 recipe = slapos.cookbook:wrapper
 ipv4 = ${slap-network-information:local-ipv4}
 ipv6 = ${slap-network-information:global-ipv6}
-wrapper-path = {{ service_directory}}/6tunnel-${:ipv6-port}
+wrapper-path = {{ directory['service'] }}/6tunnel-${:ipv6-port}
 command-line = {{ sixtunnel_executable }} -6 -4 -d -l ${:ipv6} ${:ipv6-port} ${:ipv4} ${:ipv4-port}
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
@@ -331,16 +308,6 @@ ipv6-port = {{ http_port }}
 ipv4-port = {{ https_port }}
 ipv6-port = {{ https_port }}
 
-[tunnel-6to4-base-cached_port]
-<= tunnel-6to4-base
-ipv4-port = {{ cached_port }}
-ipv6-port = {{ cached_port }}
-
-[tunnel-6to4-base-ssl_cached_port]
-<= tunnel-6to4-base
-ipv4-port = {{ ssl_cached_port }}
-ipv6-port = {{ ssl_cached_port }}
-
 {#- Define log access #}
 
 [caddy-log-access-parameters]
@@ -376,30 +343,31 @@ slave-instance-information-list = {{ json_module.dumps(slave_instance_informatio
 {%- endif %}
 monitor-base-url = {{ monitor_base_url }}
 csr_id-url = https://[${expose-csr_id-configuration:ip}]:${expose-csr_id-configuration:port}/csr_id.txt
+backend-client-csr_id-url = https://[${expose-csr_id-configuration:ip}]:${expose-csr_id-configuration:port}/backend-haproxy-csr_id.txt
 csr_id-certificate = ${get-csr_id-certificate:certificate}
 
 [kedifa-updater]
 recipe = slapos.cookbook:wrapper
-command-line = {{ kedifa_updater }}
-  --server-ca-certificate {{ kedifa_caucase_ca_certificate }}
-  --identity {{ kedifa_login_certificate }}
+command-line = {{ kedifa_configuration['kedifa-updater'] }}
+  --server-ca-certificate {{ kedifa_configuration['ca-certificate'] }}
+  --identity {{ kedifa_configuration['certificate'] }}
   --master-certificate {{ master_certificate }}
   --on-update "{{ frontend_graceful_reload }}"
   ${kedifa-updater-mapping:file}
-  {{ kedifa_updater_state_file }}
+  {{ kedifa_configuration['kedifa-updater-state-file'] }}
 
-wrapper-path = {{ service_directory }}/kedifa-updater
+wrapper-path = {{ directory['service'] }}/kedifa-updater
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [kedifa-updater-run]
 recipe = plone.recipe.command
 stop-on-error = True
-command = {{ kedifa_updater }} --prepare-only ${kedifa-updater-mapping:file} --on-update "{{ frontend_graceful_reload }}"
+command = {{ kedifa_configuration['kedifa-updater'] }} --prepare-only ${kedifa-updater-mapping:file} --on-update "{{ frontend_graceful_reload }}"
 update-command = ${:command}
 
 [kedifa-updater-mapping]
 recipe = slapos.recipe.template:jinja2
-file = {{ kedifa_updater_mapping_file }}
+file = {{ kedifa_configuration['kedifa-updater-mapping-file'] }}
 template = inline:
 {%- for mapping in kedifa_updater_mapping %}
   {{ mapping[0] }} {{ mapping[1] }} {{ mapping[2] }}
@@ -414,6 +382,47 @@ rendered = ${:file}
 template = inline: # This file contain directives to serve directories with log files for shared instances, but no shared instances are defined yet.
 rendered = {{frontend_configuration.get('log-access-configuration')}}
 
+##<Backend haproxy>
+[backend-haproxy-configuration]
+< = jinja2-template-base
+template = {{ template_backend_haproxy_configuration }}
+rendered = ${backend-haproxy-config:file}
+backend_slave_list = {{ dumps(sorted(backend_slave_list)) }}
+extra-context =
+  key backend_slave_list :backend_slave_list
+  section configuration backend-haproxy-config
+
+[backend-haproxy-config]
+file = {{ backend_haproxy_configuration['file'] }}
+pid-file = {{ backend_haproxy_configuration['pid-file'] }}
+log-socket = {{ backend_haproxy_configuration['log-socket'] }}
+local-ipv4 = {{ dumps('' ~ local_ipv4) }}
+http-port = {{ ('' ~ backend_haproxy_configuration['http-port']) }}
+https-port = {{ ('' ~ backend_haproxy_configuration['https-port']) }}
+request-timeout = {{ dumps('' ~ configuration['request-timeout']) }}
+backend-connect-timeout = {{ dumps('' ~ configuration['backend-connect-timeout']) }}
+backend-connect-retries =  {{ dumps('' ~ configuration['backend-connect-retries']) }}
+certificate = {{ dumps('' ~ backend_haproxy_configuration['certificate']) }}
+
+[store-backend-haproxy-csr_id]
+recipe = plone.recipe.command
+
+csr_id_path = {{ directory['csr_id'] }}/backend-haproxy-csr_id.txt
+csr_work_path = {{ directory['tmp'] }}/${:_buildout_section_name_}
+
+stop-on-error = False
+update-command = ${:command}
+command =
+  {{ bin_directory }}/caucase \
+    --ca-url {{ backend_haproxy_configuration['caucase-url'] }} \
+    --ca-crt {{ backend_haproxy_configuration['cas-ca-certificate'] }} \
+    --crl {{ backend_haproxy_configuration['crl'] }} \
+    --mode service \
+    --send-csr {{ backend_haproxy_configuration['csr'] }} > ${:csr_work_path} && \
+  cut -d ' ' -f 1 ${:csr_work_path} > ${:csr_id_path}
+
+##<Backend haproxy>
+
 [buildout]
 extends =
   {{ common_profile }}
@@ -423,6 +432,7 @@ extends =
 parts +=
     kedifa-updater
     kedifa-updater-run
+    backend-haproxy-configuration
 {%- for part in part_list %}
 {{ '    %s' % part }}
 {%- endfor %}
@@ -432,8 +442,6 @@ parts +=
     publish-caddy-information
     tunnel-6to4-base-http_port
     tunnel-6to4-base-https_port
-    tunnel-6to4-base-cached_port
-    tunnel-6to4-base-ssl_cached_port
     expose-csr_id
     promise-expose-csr_id-ip-port
 
@@ -442,31 +450,31 @@ cache-access = {{ cache_access }}
 [store-csr_id]
 recipe = plone.recipe.command
 
-csr_id_path = {{ directory_csr_id }}/csr_id.txt
-csr_work_path = {{ directory_tmp }}/${:_buildout_section_name_}
+csr_id_path = {{ directory['csr_id'] }}/csr_id.txt
+csr_work_path = {{ directory['tmp'] }}/${:_buildout_section_name_}
 
 stop-on-error = False
 update-command = ${:command}
 command =
   {{ bin_directory }}/caucase \
-    --ca-url {{ caucase_url }} \
-    --ca-crt {{ csr_cas_ca_certificate }} \
-    --crl {{ csr_crl }} \
+    --ca-url {{ kedifa_configuration['caucase-url'] }} \
+    --ca-crt {{ kedifa_configuration['cas-ca-certificate'] }} \
+    --crl {{ kedifa_configuration['crl'] }} \
     --mode service \
-    --send-csr {{ csr_id_csr }} > ${:csr_work_path} && \
+    --send-csr {{ kedifa_configuration['csr'] }} > ${:csr_work_path} && \
   cut -d ' ' -f 1 ${:csr_work_path} > ${:csr_id_path}
 
 [certificate-csr_id]
 recipe = plone.recipe.command
-certificate = {{ directory_caddy_csr_id }}/certificate.pem
-key = {{ directory_caddy_csr_id }}/key.pem
+certificate = {{ directory['caddy-csr_id'] }}/certificate.pem
+key = {{ directory['caddy-csr_id'] }}/key.pem
 
 stop-on-error = True
 update-command = ${:command}
 command =
   if ! [ -f ${:key} ] && ! [ -f ${:certificate} ] ; then
     openssl req -new -newkey rsa:2048 -sha256 -subj \
-      "/O={{ certificate_organization }}/OU={{ certificate_organizational_unit }}/CN=${slap-network-information:global-ipv6}" \
+      "/O={{ expose_csr_id_organization }}/OU={{ expose_csr_id_organizational_unit }}/CN=${slap-network-information:global-ipv6}" \
       -days 5 -nodes -x509 -keyout ${:key} -out ${:certificate}
   fi
 
@@ -475,7 +483,7 @@ ip = ${slap-network-information:global-ipv6}
 port = 17001
 key = ${certificate-csr_id:key}
 certificate = ${certificate-csr_id:certificate}
-error-log = {{ directory_caddy_csr_id_log }}/expose-csr_id.log
+error-log = {{ directory['caddy-csr_id-log'] }}/expose-csr_id.log
 
 [expose-csr_id-template]
 recipe = slapos.recipe.template:jinja2
@@ -486,7 +494,7 @@ template = inline:
     log ${expose-csr_id-configuration:error-log}
   }
 
-rendered = {{ directory_caddy_csr_id }}/Caddyfile
+rendered = {{ directory['caddy-csr_id'] }}/Caddyfile
 
 [promise-expose-csr_id-ip-port]
 <= monitor-promise-base
@@ -496,7 +504,9 @@ config-hostname = ${expose-csr_id-configuration:ip}
 config-port = ${expose-csr_id-configuration:port}
 
 [expose-csr_id]
-depends = ${store-csr_id:command}
+depends =
+  ${store-csr_id:command}
+  ${store-backend-haproxy-csr_id:command}
 recipe = slapos.cookbook:wrapper
 command-line = {{ caddy_executable }}
   -conf ${expose-csr_id-template:rendered}
@@ -504,9 +514,9 @@ command-line = {{ caddy_executable }}
   -http2=true
   -disable-http-challenge
   -disable-tls-alpn-challenge
-  -root {{ directory_csr_id }}
+  -root {{ directory['csr_id'] }}
 
-wrapper-path = {{ service_directory }}/expose-csr_id
+wrapper-path = {{ directory['service'] }}/expose-csr_id
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [get-csr_id-certificate]

software/caddy-frontend/templates/backend-haproxy-rsyslogd.conf.in

+module(
+  load="imuxsock"
+  SysSock.Name="{{ configuration['log-socket'] }}")
+
+# Just simply output the raw line without any additional information, as
+# haproxy emits enough information by itself
+# Also cut out first empty space in msg, which is related to rsyslogd
+# internal and end up cutting on 8k, as it's default of $MaxMessageSize
+template(name="rawoutput" type="string" string="%msg:2:8192%\n")
+$ActionFileDefaultTemplate rawoutput
+
+$FileCreateMode 0600
+$DirCreateMode 0700
+$Umask 0022
+
+$WorkDirectory {{ configuration['spool-directory'] }}
+
+# Setup logging per slave, by extracting the slave name from the log stream
+{%- set regex = ".*-backend (.*)-http.*" %}
+template(name="extract_slave_name" type="string" string="%msg:R,ERE,1,FIELD:{{ regex }}--end%")
+set $!slave_name = exec_template("extract_slave_name");
+template(name="slave_output" type="string" string="{{ configuration['caddy-log-directory'] }}/%$!slave_name%_backend_log")
+if (re_match($msg, "{{ regex }}")) then {
+ action(type="omfile" dynaFile="slave_output")
+ stop
+}
+
+{#- emit all not catched messages to full log file #}
+*.* {{ configuration['log-file'] }}

software/caddy-frontend/templates/backend-haproxy.cfg.in

+global
+  pidfile {{ configuration['pid-file'] }}
+  # master-worker is compatible with foreground with process management
+  master-worker
+
+log {{ configuration['log-socket'] }} local0
+defaults
+  log global
+  mode http
+  option httplog
+  timeout queue 60s
+  timeout server {{ configuration['request-timeout'] }}s
+  timeout client {{ configuration['request-timeout'] }}s
+  timeout connect {{ configuration['backend-connect-timeout'] }}s
+  retries {{ configuration['backend-connect-retries'] }}
+
+{%- macro frontend_entry(slave_instance, scheme) %}
+{%-   set host_list = (slave_instance.get('server-alias') or  '').split() %}
+{%-   if slave_instance.get('custom_domain') not in host_list %}
+{%-     do host_list.append(slave_instance.get('custom_domain')) %}
+{%-   endif %}
+{%-   for host in host_list %}
+{%-     if host.startswith('*.') %}
+{#-     hdr_sub has to be used, as anyway something.example.com shall match *.example.com[:port], with optional port #}
+  acl is_{{ slave_instance['slave_reference'] }} hdr_sub(host) -i {{ host[2:] }}
+{%-     else %}
+  acl is_{{ slave_instance['slave_reference'] }} hdr_dom(host) -i {{ host }}
+{%-     endif %}
+{%-   endfor %}
+  use_backend {{ slave_instance['slave_reference'] }}-{{ scheme }} if is_{{ slave_instance['slave_reference'] }}
+{%- endmacro %}
+
+frontend http-backend
+  bind {{ configuration['local-ipv4'] }}:{{ configuration['http-port'] }}
+{%- for slave_instance in backend_slave_list %}
+{{ frontend_entry(slave_instance, 'http') }}
+{%- endfor %}
+
+frontend https-backend
+  bind {{ configuration['local-ipv4'] }}:{{ configuration['https-port'] }}
+{%- for slave_instance in backend_slave_list %}
+{{ frontend_entry(slave_instance, 'https') }}
+{%- endfor %}
+
+{%- for slave_instance in backend_slave_list %}
+{%-   for (scheme, prefix) in [('http', 'http_backend'), ('https', 'https_backend')] %}
+{%-     set info_dict = slave_instance[prefix] %}
+{%-     if info_dict['scheme'] == 'https' %}
+{%-       set ssl = [] %}
+{%-       if slave_instance['authenticate-to-backend'] %}
+{%-         set ssl = ['crt %s' % (configuration['certificate'],)] %}
+{%-       endif %}
+{%-       do ssl.append('ssl verify') %}
+{%-       set path_to_ssl_proxy_ca_crt = slave_instance.get('path_to_ssl_proxy_ca_crt') %}
+{%-       if slave_instance['ssl_proxy_verify'] %}
+{%-         if path_to_ssl_proxy_ca_crt %}
+{%-           do ssl.append('required ca-file %s' % (path_to_ssl_proxy_ca_crt,)) %}
+{%-         else %}
+{#-         Backend SSL shall be verified, but not CA provided, disallow connection #}
+{#-         Simply dropping hostname from the dict will result with ignoring it... #}
+{%-         do info_dict.__setitem__('hostname', '') %}
+{%-         endif %}
+{%-       else %}
+{%-         do ssl.append('none') %}
+{%-       endif %}
+{%-       set ssl = ' '.join(ssl) %}
+{%-     else %}
+{%-       set ssl = '' %}
+{%-     endif %}
+
+backend {{ slave_instance['slave_reference'] }}-{{ scheme }}
+{%-     set hostname = info_dict['hostname'] %}
+{%-     set port = info_dict['port'] %}
+{%-     set path = info_dict['path'].rstrip('/') %}
+{%-     if hostname and port %}
+  timeout server {{ slave_instance['request-timeout'] }}s
+  timeout connect {{ slave_instance['backend-connect-timeout'] }}s
+  retries {{ slave_instance['backend-connect-retries'] }}
+  server backend {{ hostname }}:{{ port }} {{ ssl }}
+{%-       if path %}
+  http-request set-path {{ path }}%[path]
+{%-       endif %}
+{%-     endif %}
+{%-   endfor %}
+{%- endfor %}

software/caddy-frontend/templates/cached-virtualhost.conf.in

-{%- set TRUE_VALUES = ['y', 'yes', '1', 'true'] %}
-{%- set server_alias_list =  slave_parameter.get('server-alias', '').split() %}
-{%- set ssl_proxy_verify = ('' ~ slave_parameter.get('ssl-proxy-verify', '')).lower() in TRUE_VALUES %}
-{%- set host_list = [] %}
-{%- for host in [slave_parameter.get('custom_domain')] + server_alias_list %}
-{%-   if host not in host_list %}
-{%-     do host_list.append(host) %}
-{%-   endif %}
-{%- endfor %}
-{%- set http_backend_host_list = [] %}
-{%- set https_backend_host_list = [] %}
-{%- for host in host_list %}
-{%-   do http_backend_host_list.append('http://%s:%s' % (host, slave_parameter['cached_port'])) %}
-{%-   do https_backend_host_list.append('http://%s:%s' % (host, slave_parameter['ssl_cached_port'])) %}
-{%- endfor %}
-
-# SSL-disabled backends
-{{ http_backend_host_list|join(', ') }} {
-  bind {{ slave_parameter['local_ipv4'] }}
-# Rewrite part
-  proxy / {{ slave_parameter.get('backend_url', '') }} {
-    try_duration {{ slave_parameter['proxy_try_duration'] }}s
-    try_interval {{ slave_parameter['proxy_try_interval'] }}ms
-
-    header_upstream Host {host}
-{#    header_upstream -X-Forwarded-For - caddy behaviour while removing and setting header is unstable, so for now original header has to be kept, even if in that case it comes from after ATS caddy itself #}
-    header_upstream X-Forwarded-For {>X-Forwarded-For-Real}
-    header_upstream -X-Forwarded-For-Real
-    timeout {{ slave_parameter['request_timeout'] }}s
-{%- if ssl_proxy_verify %}
-{%-   if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
-    ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
-{%-   endif %}
-{%- else %}
-    insecure_skip_verify
-{%- endif %}
-  }
-  log / {{ slave_parameter.get('access_log_cache_direct') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
-  }
-
-  errors {{ slave_parameter.get('error_log_cache_direct') }} {
-    rotate_size 0
-  }
-}
-
-# SSL-enabled backends
-{{ https_backend_host_list|join(', ') }} {
-  bind {{ slave_parameter['local_ipv4'] }}
-  proxy / {{ slave_parameter.get('https_backend_url', '') }} {
-    try_duration {{ slave_parameter['proxy_try_duration'] }}s
-    try_interval {{ slave_parameter['proxy_try_interval'] }}ms
-    header_upstream Host {host}
-{#    header_upstream -X-Forwarded-For - caddy behaviour while removing and setting header is unstable, so for now original header has to be kept, even if in that case it comes from after ATS caddy itself #}
-    header_upstream X-Forwarded-For {>X-Forwarded-For-Real}
-    header_upstream -X-Forwarded-For-Real
-    timeout {{ slave_parameter['request_timeout'] }}s
-{%- if ssl_proxy_verify %}
-{%-   if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
-    ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
-{%-   endif %}
-{%- else %}
-    insecure_skip_verify
-{%- endif %}
-  }
-  log / {{ slave_parameter.get('access_log_cache_direct') }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
-  }
-
-  errors {{ slave_parameter.get('error_log_cache_direct') }} {
-    rotate_size 0
-  }
-}

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

@@ -9,7 +9,6 @@
 {%- endif %} {#- if prefer_gzip #}
 {%- set server_alias_list =  slave_parameter.get('server-alias', '').split() %}
 {%- set enable_h2 = slave_parameter['global_disable_http2'].lower() not in TRUE_VALUES and slave_parameter.get('enable-http2', slave_parameter['enable_http2_by_default']).lower() in TRUE_VALUES %}
-{%- set ssl_proxy_verify = slave_parameter.get('ssl-proxy-verify', '').lower() in TRUE_VALUES %}
 {%- set disabled_cookie_list =  slave_parameter.get('disabled-cookie-list', '').split() %}
 {%- set https_only = slave_parameter.get('https-only', 'true').lower() in TRUE_VALUES %}
 {%- set slave_type = slave_parameter.get('type', '') %}
@@ -41,31 +40,18 @@
 {%- endif %}
 
 {%- macro proxy_header() %}
-    try_duration {{ slave_parameter['proxy_try_duration'] }}s
-    try_interval {{ slave_parameter['proxy_try_interval'] }}ms
-    timeout {{ slave_parameter['request_timeout'] }}s
-{%-   if ssl_proxy_verify %}
-{%-     if 'path_to_ssl_proxy_ca_crt' in slave_parameter %}
-    ca_certificates {{ slave_parameter['path_to_ssl_proxy_ca_crt'] }}
-{%-     endif %} {#-     if 'path_to_ssl_proxy_ca_crt' in slave_parameter #}
-{%-   else %} {#-   if ssl_proxy_verify #}
-    insecure_skip_verify
-{%-   endif %} {#-   if ssl_proxy_verify #}
+    timeout {{ slave_parameter['request-timeout'] }}s
     # force reset of X-Forwarded-For
     header_upstream X-Forwarded-For {remote}
-{%-     if enable_cache %}
-    # provide a header for other components
-    header_upstream X-Forwarded-For-Real {remote}
-{%-     endif %}
 {%- endmacro %} {# proxy_header #}
 
 {%- for tls in [True, False] %}
 {%- if tls %}
-{%- set backend_url = slave_parameter.get('https-url', slave_parameter.get('url', '')).rstrip('/') %}
+{%-   set backend_url = slave_parameter.get('backend-https-url', slave_parameter.get('backend-http-url')) %}
 # SSL enabled hosts
 {{ https_host_list|join(', ') }} {
 {%- else %}
-{%- set backend_url = slave_parameter.get('url', '').rstrip('/') %}
+{%-   set backend_url = slave_parameter['backend-http-url'] %}
 # SSL-disabled hosts
 {{ http_host_list|join(', ') }} {
 {%- endif %}
@@ -121,7 +107,7 @@
   # Zope configuration
 {%-   for (proxy_name, proxy_comment) in proxy_append_list %}
   # {{ proxy_comment }}
-  proxy /{{ proxy_name }} {{ backend_url }} {
+  proxy "/{{ proxy_name }}" {{ backend_url }} {
 {{ proxy_header() }}
 {%-     if proxy_name == 'prefer-gzip' %}
     without /prefer-gzip
@@ -178,11 +164,13 @@
 {%- endif %}
   } {# rewrite #}
 {%- endif %} {#- if prefer_gzip #}
-{%- elif slave_type ==  'redirect' and backend_url %} {#- if slave_type ==  'zope' and backend_url #}
+{%- elif slave_type == 'redirect' %}
+{%-   if backend_url %}
   # Redirect configuration
   redir 302 {
     /  {{ backend_url }}{rewrite_uri}
-  } {# redir #}
+  }
+{%-   endif %}
 {%- elif slave_type == 'notebook' %}
   proxy / {{ backend_url }} {
 {{ proxy_header() }}
@@ -204,14 +192,18 @@
 {{ proxy_header() }}
 {%-     if websocket_transparent %}
     transparent
+{%-     else %}
+    header_upstream Host {host}
 {%-     endif %}
   }
 {%-     for websocket_path in websocket_path_list %}
-  proxy /{{ websocket_path }} {{ backend_url }} {
+  proxy "/{{ websocket_path }}" {{ backend_url }} {
 {{ proxy_header() }}
     websocket
 {%-       if websocket_transparent %}
     transparent
+{%-       else %}
+    header_upstream Host {host}
 {%-       endif %}
   }
 {%-     endfor %}
@@ -221,6 +213,8 @@
     websocket
 {%-   if websocket_transparent %}
     transparent
+{%-   else %}
+    header_upstream Host {host}
 {%-   endif %}
   }
 {%-   endif %}
@@ -236,7 +230,7 @@
 
 {%-   for (proxy_name, proxy_comment) in proxy_append_list %}
   # {{ proxy_comment }}
-  proxy /{{ proxy_name }} {{ backend_url }} {
+  proxy "/{{ proxy_name }}" {{ backend_url }} {
 {{ proxy_header() }}
 {%-     if proxy_name == 'prefer-gzip' %}
     without /prefer-gzip

software/caddy-frontend/templates/validate-script.sh.in

@@ -10,10 +10,10 @@ if [ -f $LAST_STATE_FILE ] ; then
   old_found=$(find $LAST_STATE_FILE -mmin +120 | wc -l)
 fi
 
-if [ "$old_found" -eq 1 ] || {{ caddy_configuration_state }} ; then
+if [ "$old_found" -eq 1 ] || {{ configuration_state_command }} ; then
   # do not catch errors during validation
   set +e
-  {{ wrapper }} -validate
+  {{ validate_command }}
   echo $? > $LAST_STATE_FILE
   set -e
 fi

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_log-CADDY.txt

-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_file_list_run-CADDY.txt

-T-1/var/run/kedifa.pid

software/caddy-frontend/test/test_data/test.TestDefaultMonitorHttpdPort.test_supervisor_state-CADDY.txt

-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch EXITED
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch STOPPED
-T-2:6tunnel-11443-{hash-generic}-on-watch STOPPED
-T-2:6tunnel-26011-{hash-generic}-on-watch STOPPED
-T-2:6tunnel-26012-{hash-generic}-on-watch STOPPED
-T-2:bootstrap-monitor STOPPED
-T-2:certificate_authority-{hash-generic}-on-watch STOPPED
-T-2:crond-{hash-generic}-on-watch STOPPED
-T-2:expose-csr_id-{hash-generic}-on-watch STOPPED
-T-2:frontend-caddy-safe-graceful STOPPED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch STOPPED
-T-2:kedifa-login-certificate-caucase-updater-on-watch STOPPED
-T-2:kedifa-updater-{hash-generic}-on-watch STOPPED
-T-2:monitor-httpd-{hash-generic}-on-watch STOPPED
-T-2:monitor-httpd-graceful STOPPED
-T-2:trafficserver-{hash-generic}-on-watch STOPPED
-T-2:trafficserver-reload STOPPED

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_site_1_access_log
-T-2/var/log/httpd/_site_1_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestDuplicateSiteKeyProtection.test_supervisor_state-CADDY.txt

-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt

@@ -5,18 +5,21 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -5,18 +5,21 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt

@@ -5,18 +5,21 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -5,18 +5,21 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_empty_access_log
-T-2/var/log/httpd/_empty_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestMalformedBackenUrlSlave.test_supervisor_state-CADDY.txt

-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_log-CADDY.txt

@@ -5,6 +5,7 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestMasterRequest.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

@@ -5,6 +5,7 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_url_access_log
-T-2/var/log/httpd-cache-direct/_url_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_url_access_log
-T-2/var/log/httpd/_url_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestQuicEnabled.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

@@ -5,10 +5,9 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_default_access_log
-T-2/var/log/httpd-cache-direct/_default_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_access_log
 T-2/var/log/httpd/_default_error_log

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_default_access_log
-T-2/var/log/httpd/_default_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestRe6stVerificationUrlSlave.test_supervisor_state-CADDY.txt

-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate
-T-3/etc/cron.d/logrotate
-T-3/etc/cron.d/monitor-configurator
-T-3/etc/cron.d/monitor-globalstate
-T-3/etc/cron.d/monitor_collect
-T-3/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_replicate_access_log
-T-2/var/log/httpd-cache-direct/_replicate_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_replicate_access_log
-T-2/var/log/httpd/_replicate_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestReplicateSlave.test_supervisor_state-CADDY.txt

-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED
-T-3:6tunnel-11080-{hash-generic}-on-watch STOPPED
-T-3:6tunnel-11443-{hash-generic}-on-watch STOPPED
-T-3:6tunnel-26011-{hash-generic}-on-watch STOPPED
-T-3:6tunnel-26012-{hash-generic}-on-watch STOPPED
-T-3:bootstrap-monitor STOPPED
-T-3:certificate_authority-{hash-generic}-on-watch STOPPED
-T-3:crond-{hash-generic}-on-watch STOPPED
-T-3:expose-csr_id-{hash-generic}-on-watch STOPPED
-T-3:frontend-caddy-safe-graceful STOPPED
-T-3:frontend_caddy-{hash-caddy-T-3}-on-watch STOPPED
-T-3:kedifa-login-certificate-caucase-updater-on-watch STOPPED
-T-3:kedifa-updater-{hash-generic}-on-watch STOPPED
-T-3:monitor-httpd-{hash-generic}-on-watch STOPPED
-T-3:monitor-httpd-graceful STOPPED
-T-3:trafficserver-{hash-generic}-on-watch STOPPED
-T-3:trafficserver-reload STOPPED

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_log-CADDY.txt

@@ -5,126 +5,175 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_Url_access_log
+T-2/var/log/httpd/_Url_backend_log
 T-2/var/log/httpd/_Url_error_log
+T-2/var/log/httpd/_auth-to-backend-backend-ignore_access_log
+T-2/var/log/httpd/_auth-to-backend-backend-ignore_backend_log
+T-2/var/log/httpd/_auth-to-backend-backend-ignore_error_log
+T-2/var/log/httpd/_auth-to-backend-not-configured_access_log
+T-2/var/log/httpd/_auth-to-backend-not-configured_backend_log
+T-2/var/log/httpd/_auth-to-backend-not-configured_error_log
+T-2/var/log/httpd/_auth-to-backend_access_log
+T-2/var/log/httpd/_auth-to-backend_backend_log
+T-2/var/log/httpd/_auth-to-backend_error_log
 T-2/var/log/httpd/_ciphers_access_log
+T-2/var/log/httpd/_ciphers_backend_log
 T-2/var/log/httpd/_ciphers_error_log
 T-2/var/log/httpd/_custom_domain_access_log
+T-2/var/log/httpd/_custom_domain_backend_log
 T-2/var/log/httpd/_custom_domain_error_log
 T-2/var/log/httpd/_custom_domain_server_alias_access_log
+T-2/var/log/httpd/_custom_domain_server_alias_backend_log
 T-2/var/log/httpd/_custom_domain_server_alias_error_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
+T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
+T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
 T-2/var/log/httpd/_custom_domain_wildcard_access_log
+T-2/var/log/httpd/_custom_domain_wildcard_backend_log
 T-2/var/log/httpd/_custom_domain_wildcard_error_log
 T-2/var/log/httpd/_disabled-cookie-list_access_log
+T-2/var/log/httpd/_disabled-cookie-list_backend_log
 T-2/var/log/httpd/_disabled-cookie-list_error_log
 T-2/var/log/httpd/_empty_access_log
+T-2/var/log/httpd/_empty_backend_log
 T-2/var/log/httpd/_empty_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
+T-2/var/log/httpd/_enable_cache-disable-no-cache-request_backend_log
 T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
+T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_backend_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_enable_cache_access_log
+T-2/var/log/httpd/_enable_cache_backend_log
 T-2/var/log/httpd/_enable_cache_custom_domain_access_log
+T-2/var/log/httpd/_enable_cache_custom_domain_backend_log
 T-2/var/log/httpd/_enable_cache_custom_domain_error_log
 T-2/var/log/httpd/_enable_cache_error_log
 T-2/var/log/httpd/_enable_cache_server_alias_access_log
+T-2/var/log/httpd/_enable_cache_server_alias_backend_log
 T-2/var/log/httpd/_enable_cache_server_alias_error_log
 T-2/var/log/httpd/_https-only_access_log
+T-2/var/log/httpd/_https-only_backend_log
 T-2/var/log/httpd/_https-only_error_log
 T-2/var/log/httpd/_monitor-ipv4-test_access_log
+T-2/var/log/httpd/_monitor-ipv4-test_backend_log
 T-2/var/log/httpd/_monitor-ipv4-test_error_log
 T-2/var/log/httpd/_monitor-ipv6-test_access_log
+T-2/var/log/httpd/_monitor-ipv6-test_backend_log
 T-2/var/log/httpd/_monitor-ipv6-test_error_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
+T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_error_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
+T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_backend_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
 T-2/var/log/httpd/_server-alias-duplicated_access_log
+T-2/var/log/httpd/_server-alias-duplicated_backend_log
 T-2/var/log/httpd/_server-alias-duplicated_error_log
+T-2/var/log/httpd/_server-alias-empty_access_log
+T-2/var/log/httpd/_server-alias-empty_backend_log
+T-2/var/log/httpd/_server-alias-empty_error_log
 T-2/var/log/httpd/_server-alias-wildcard_access_log
+T-2/var/log/httpd/_server-alias-wildcard_backend_log
 T-2/var/log/httpd/_server-alias-wildcard_error_log
 T-2/var/log/httpd/_server-alias_access_log
+T-2/var/log/httpd/_server-alias_backend_log
 T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
+T-2/var/log/httpd/_server-alias_custom_domain-duplicated_backend_log
 T-2/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
 T-2/var/log/httpd/_server-alias_error_log
 T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd/_ssl-proxy-verify-unverified_backend_log
 T-2/var/log/httpd/_ssl-proxy-verify-unverified_error_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
+T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
 T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
+T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
 T-2/var/log/httpd/_ssl_ca_crt_only_access_log
+T-2/var/log/httpd/_ssl_ca_crt_only_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_only_error_log
 T-2/var/log/httpd/_type-notebook_access_log
+T-2/var/log/httpd/_type-notebook_backend_log
 T-2/var/log/httpd/_type-notebook_error_log
+T-2/var/log/httpd/_type-redirect-custom_domain_access_log
+T-2/var/log/httpd/_type-redirect-custom_domain_error_log
 T-2/var/log/httpd/_type-redirect_access_log
 T-2/var/log/httpd/_type-redirect_error_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log
+T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_backend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_error_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log
+T-2/var/log/httpd/_type-websocket-websocket-path-list_backend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list_error_log
 T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log
+T-2/var/log/httpd/_type-websocket-websocket-transparent-false_backend_log
 T-2/var/log/httpd/_type-websocket-websocket-transparent-false_error_log
 T-2/var/log/httpd/_type-websocket_access_log
+T-2/var/log/httpd/_type-websocket_backend_log
 T-2/var/log/httpd/_type-websocket_error_log
 T-2/var/log/httpd/_type-zope-default-path_access_log
+T-2/var/log/httpd/_type-zope-default-path_backend_log
 T-2/var/log/httpd/_type-zope-default-path_error_log
 T-2/var/log/httpd/_type-zope-path_access_log
+T-2/var/log/httpd/_type-zope-path_backend_log
 T-2/var/log/httpd/_type-zope-path_error_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log
+T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_backend_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
+T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_backend_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
+T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
+T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_backend_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
 T-2/var/log/httpd/_type-zope_access_log
+T-2/var/log/httpd/_type-zope_backend_log
 T-2/var/log/httpd/_type-zope_error_log
 T-2/var/log/httpd/_url_https-url_access_log
+T-2/var/log/httpd/_url_https-url_backend_log
 T-2/var/log/httpd/_url_https-url_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
 T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py

software/caddy-frontend/test/test_data/test.TestSlave.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlave.test_monitor_promise_list-CADDY.txt

-T-2/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-T-2/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test

software/caddy-frontend/test/test_data/test.TestSlave.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_default-path-unsafe_access_log
-T-2/var/log/httpd/_default-path-unsafe_error_log
-T-2/var/log/httpd/_monitor-ipv4-test-unsafe_access_log
-T-2/var/log/httpd/_monitor-ipv4-test-unsafe_error_log
-T-2/var/log/httpd/_monitor-ipv6-test-unsafe_access_log
-T-2/var/log/httpd/_monitor-ipv6-test-unsafe_error_log
-T-2/var/log/httpd/_server-alias-same_access_log
-T-2/var/log/httpd/_server-alias-same_error_log
-T-2/var/log/httpd/_virtualhostroot-http-port-unsafe_access_log
-T-2/var/log/httpd/_virtualhostroot-http-port-unsafe_error_log
-T-2/var/log/httpd/_virtualhostroot-https-port-unsafe_access_log
-T-2/var/log/httpd/_virtualhostroot-https-port-unsafe_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_monitor_promise_list-CADDY.txt

-T-2/etc/monitor-promise/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test
-T-2/etc/monitor-promise/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test

software/caddy-frontend/test/test_data/test.TestSlaveBadParameters.test_supervisor_state-CADDY.txt

-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch EXITED
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_log-CADDY.txt

@@ -5,16 +5,15 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_default_ciphers_access_log
-T-2/var/log/httpd-cache-direct/_default_ciphers_error_log
-T-2/var/log/httpd-cache-direct/_own_ciphers_access_log
-T-2/var/log/httpd-cache-direct/_own_ciphers_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_ciphers_access_log
+T-2/var/log/httpd/_default_ciphers_backend_log
 T-2/var/log/httpd/_default_ciphers_error_log
 T-2/var/log/httpd/_own_ciphers_access_log
+T-2/var/log/httpd/_own_ciphers_backend_log
 T-2/var/log/httpd/_own_ciphers_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveCiphers.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

@@ -5,126 +5,175 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_Url_access_log
+T-2/var/log/httpd/_Url_backend_log
 T-2/var/log/httpd/_Url_error_log
+T-2/var/log/httpd/_auth-to-backend-backend-ignore_access_log
+T-2/var/log/httpd/_auth-to-backend-backend-ignore_backend_log
+T-2/var/log/httpd/_auth-to-backend-backend-ignore_error_log
+T-2/var/log/httpd/_auth-to-backend-not-configured_access_log
+T-2/var/log/httpd/_auth-to-backend-not-configured_backend_log
+T-2/var/log/httpd/_auth-to-backend-not-configured_error_log
+T-2/var/log/httpd/_auth-to-backend_access_log
+T-2/var/log/httpd/_auth-to-backend_backend_log
+T-2/var/log/httpd/_auth-to-backend_error_log
 T-2/var/log/httpd/_ciphers_access_log
+T-2/var/log/httpd/_ciphers_backend_log
 T-2/var/log/httpd/_ciphers_error_log
 T-2/var/log/httpd/_custom_domain_access_log
+T-2/var/log/httpd/_custom_domain_backend_log
 T-2/var/log/httpd/_custom_domain_error_log
 T-2/var/log/httpd/_custom_domain_server_alias_access_log
+T-2/var/log/httpd/_custom_domain_server_alias_backend_log
 T-2/var/log/httpd/_custom_domain_server_alias_error_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
+T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
+T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
 T-2/var/log/httpd/_custom_domain_wildcard_access_log
+T-2/var/log/httpd/_custom_domain_wildcard_backend_log
 T-2/var/log/httpd/_custom_domain_wildcard_error_log
 T-2/var/log/httpd/_disabled-cookie-list_access_log
+T-2/var/log/httpd/_disabled-cookie-list_backend_log
 T-2/var/log/httpd/_disabled-cookie-list_error_log
 T-2/var/log/httpd/_empty_access_log
+T-2/var/log/httpd/_empty_backend_log
 T-2/var/log/httpd/_empty_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
+T-2/var/log/httpd/_enable_cache-disable-no-cache-request_backend_log
 T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
+T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log
 T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_backend_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
 T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_enable_cache_access_log
+T-2/var/log/httpd/_enable_cache_backend_log
 T-2/var/log/httpd/_enable_cache_custom_domain_access_log
+T-2/var/log/httpd/_enable_cache_custom_domain_backend_log
 T-2/var/log/httpd/_enable_cache_custom_domain_error_log
 T-2/var/log/httpd/_enable_cache_error_log
 T-2/var/log/httpd/_enable_cache_server_alias_access_log
+T-2/var/log/httpd/_enable_cache_server_alias_backend_log
 T-2/var/log/httpd/_enable_cache_server_alias_error_log
 T-2/var/log/httpd/_https-only_access_log
+T-2/var/log/httpd/_https-only_backend_log
 T-2/var/log/httpd/_https-only_error_log
 T-2/var/log/httpd/_monitor-ipv4-test_access_log
+T-2/var/log/httpd/_monitor-ipv4-test_backend_log
 T-2/var/log/httpd/_monitor-ipv4-test_error_log
 T-2/var/log/httpd/_monitor-ipv6-test_access_log
+T-2/var/log/httpd/_monitor-ipv6-test_backend_log
 T-2/var/log/httpd/_monitor-ipv6-test_error_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
+T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_error_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
+T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_backend_log
 T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
 T-2/var/log/httpd/_server-alias-duplicated_access_log
+T-2/var/log/httpd/_server-alias-duplicated_backend_log
 T-2/var/log/httpd/_server-alias-duplicated_error_log
+T-2/var/log/httpd/_server-alias-empty_access_log
+T-2/var/log/httpd/_server-alias-empty_backend_log
+T-2/var/log/httpd/_server-alias-empty_error_log
 T-2/var/log/httpd/_server-alias-wildcard_access_log
+T-2/var/log/httpd/_server-alias-wildcard_backend_log
 T-2/var/log/httpd/_server-alias-wildcard_error_log
 T-2/var/log/httpd/_server-alias_access_log
+T-2/var/log/httpd/_server-alias_backend_log
 T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
+T-2/var/log/httpd/_server-alias_custom_domain-duplicated_backend_log
 T-2/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
 T-2/var/log/httpd/_server-alias_error_log
 T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd/_ssl-proxy-verify-unverified_backend_log
 T-2/var/log/httpd/_ssl-proxy-verify-unverified_error_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
 T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
+T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
 T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
+T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
 T-2/var/log/httpd/_ssl_ca_crt_only_access_log
+T-2/var/log/httpd/_ssl_ca_crt_only_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_only_error_log
 T-2/var/log/httpd/_type-notebook_access_log
+T-2/var/log/httpd/_type-notebook_backend_log
 T-2/var/log/httpd/_type-notebook_error_log
+T-2/var/log/httpd/_type-redirect-custom_domain_access_log
+T-2/var/log/httpd/_type-redirect-custom_domain_error_log
 T-2/var/log/httpd/_type-redirect_access_log
 T-2/var/log/httpd/_type-redirect_error_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log
+T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_backend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_error_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log
+T-2/var/log/httpd/_type-websocket-websocket-path-list_backend_log
 T-2/var/log/httpd/_type-websocket-websocket-path-list_error_log
 T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log
+T-2/var/log/httpd/_type-websocket-websocket-transparent-false_backend_log
 T-2/var/log/httpd/_type-websocket-websocket-transparent-false_error_log
 T-2/var/log/httpd/_type-websocket_access_log
+T-2/var/log/httpd/_type-websocket_backend_log
 T-2/var/log/httpd/_type-websocket_error_log
 T-2/var/log/httpd/_type-zope-default-path_access_log
+T-2/var/log/httpd/_type-zope-default-path_backend_log
 T-2/var/log/httpd/_type-zope-default-path_error_log
 T-2/var/log/httpd/_type-zope-path_access_log
+T-2/var/log/httpd/_type-zope-path_backend_log
 T-2/var/log/httpd/_type-zope-path_error_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log
+T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_backend_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
+T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log
 T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
+T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_backend_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
+T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
+T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
 T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
+T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
+T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_backend_log
 T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
 T-2/var/log/httpd/_type-zope_access_log
+T-2/var/log/httpd/_type-zope_backend_log
 T-2/var/log/httpd/_type-zope_error_log
 T-2/var/log/httpd/_url_https-url_access_log
+T-2/var/log/httpd/_url_https-url_backend_log
 T-2/var/log/httpd/_url_https-url_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
 T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_monitor_promise_list-CADDY.txt

-T-1/etc/monitor-promise/check-_monitor-ipv4-test-ipv4-packet-list-test
-T-1/etc/monitor-promise/check-_monitor-ipv6-test-ipv6-packet-list-test

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt

@@ -5,34 +5,45 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
+T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
+T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
 T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
+T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
 T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
+T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log
 T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
 T-2/var/log/httpd/_ssl_from_master_access_log
+T-2/var/log/httpd/_ssl_from_master_backend_log
 T-2/var/log/httpd/_ssl_from_master_error_log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_access_log
+T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_backend_log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_error_log
 T-2/var/log/httpd/_ssl_from_slave_access_log
+T-2/var/log/httpd/_ssl_from_slave_backend_log
 T-2/var/log/httpd/_ssl_from_slave_error_log
 T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_access_log
+T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_backend_log
 T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_error_log
 T-2/var/log/httpd/_type-notebook-ssl_from_master_access_log
+T-2/var/log/httpd/_type-notebook-ssl_from_master_backend_log
 T-2/var/log/httpd/_type-notebook-ssl_from_master_error_log
 T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_access_log
+T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_backend_log
 T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_error_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_access_log
+T-2/var/log/httpd/_type-notebook-ssl_from_slave_backend_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_error_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_access_log
+T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_backend_log
 T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt

@@ -5,12 +5,12 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_kedifa_overrides_master_certificate_access_log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_kedifa_overrides_master_certificate_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_access_log
+T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_backend_log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt

@@ -5,12 +5,12 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedifa.log
 T-1/var/log/monitor-httpd-access.log
 T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
 T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_access_log
+T-2/var/log/httpd/_ssl_from_master_backend_log
 T-2/var/log/httpd/_ssl_from_master_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin-CADDY.txt

 T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
 T-0/etc/plugin/aikc-user-caucase-updater.py
 T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
 T-0/etc/plugin/check-free-disk-space.py
 T-0/etc/plugin/monitor-bootstrap-status.py
 T-0/etc/plugin/monitor-http-frontend.py
@@ -17,13 +19,15 @@ T-1/etc/plugin/monitor-bootstrap-status.py
 T-1/etc/plugin/monitor-http-frontend.py
 T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
 T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
 T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
 T-2/etc/plugin/caddy_frontend_ipv4_http.py
 T-2/etc/plugin/caddy_frontend_ipv4_https.py
 T-2/etc/plugin/caddy_frontend_ipv6_http.py
 T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
 T-2/etc/plugin/caucase-updater.py
 T-2/etc/plugin/check-free-disk-space.py
 T-2/etc/plugin/expose-csr_id-ip-port-listening.py

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt

 T-0/var/run/monitor-httpd.pid
 T-1/var/run/kedifa.pid
 T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
 T-2/var/run/graceful_configuration_state_signature
 T-2/var/run/httpd.pid
 T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
 T-0:aikc-user-caucase-updater-on-watch RUNNING
 T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
 T-0:certificate_authority-{hash-generic}-on-watch RUNNING
 T-0:crond-{hash-generic}-on-watch RUNNING
 T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
@@ -17,8 +19,10 @@ T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
 T-1:monitor-httpd-graceful EXITED
 T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
 T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
 T-2:bootstrap-monitor EXITED
 T-2:certificate_authority-{hash-generic}-on-watch RUNNING
 T-2:crond-{hash-generic}-on-watch RUNNING

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_dummy-cached_access_log
-T-2/var/log/httpd/_dummy-cached_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable-http2-true_access_log
-T-2/var/log/httpd/_enable-http2-true_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlave.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_dummy-cached_access_log
-T-2/var/log/httpd/_dummy-cached_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable-http2-true_access_log
-T-2/var/log/httpd/_enable-http2-true_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultDefaultSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_dummy-cached_access_log
-T-2/var/log/httpd/_dummy-cached_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable-http2-true_access_log
-T-2/var/log/httpd/_enable-http2-true_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlave.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_dummy-cached_access_log
-T-2/var/log/httpd-cache-direct/_dummy-cached_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_dummy-cached_access_log
-T-2/var/log/httpd/_dummy-cached_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable-http2-true_access_log
-T-2/var/log/httpd/_enable-http2-true_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestMasterRequest.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestMasterRequest.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestMasterRequest.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestMasterRequest.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestMasterRequest.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestMasterRequestDomain.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestMasterRequestDomain.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestMasterRequestDomain.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestMasterRequestDomain.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestMasterRequestDomain.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestQuicEnabled.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestQuicEnabled.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_url_access_log
-T-2/var/log/httpd-cache-direct/_url_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_url_access_log
-T-2/var/log/httpd/_url_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestQuicEnabled.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestQuicEnabled.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestQuicEnabled.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestRe6stVerificationUrlDefaultSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestRe6stVerificationUrlDefaultSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_default_access_log
-T-2/var/log/httpd-cache-direct/_default_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_default_access_log
-T-2/var/log/httpd/_default_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestRe6stVerificationUrlDefaultSlave.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestRe6stVerificationUrlDefaultSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestRe6stVerificationUrlDefaultSlave.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestSlave.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestSlave.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_Url_access_log
-T-2/var/log/httpd/_Url_error_log
-T-2/var/log/httpd/_ciphers_access_log
-T-2/var/log/httpd/_ciphers_error_log
-T-2/var/log/httpd/_custom_domain_access_log
-T-2/var/log/httpd/_custom_domain_error_log
-T-2/var/log/httpd/_custom_domain_server_alias_access_log
-T-2/var/log/httpd/_custom_domain_server_alias_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
-T-2/var/log/httpd/_custom_domain_wildcard_access_log
-T-2/var/log/httpd/_custom_domain_wildcard_error_log
-T-2/var/log/httpd/_disabled-cookie-list_access_log
-T-2/var/log/httpd/_disabled-cookie-list_error_log
-T-2/var/log/httpd/_empty_access_log
-T-2/var/log/httpd/_empty_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_enable_cache_access_log
-T-2/var/log/httpd/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd/_enable_cache_error_log
-T-2/var/log/httpd/_enable_cache_server_alias_access_log
-T-2/var/log/httpd/_enable_cache_server_alias_error_log
-T-2/var/log/httpd/_https-only_access_log
-T-2/var/log/httpd/_https-only_error_log
-T-2/var/log/httpd/_monitor-ipv4-test_access_log
-T-2/var/log/httpd/_monitor-ipv4-test_error_log
-T-2/var/log/httpd/_monitor-ipv6-test_access_log
-T-2/var/log/httpd/_monitor-ipv6-test_error_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_error_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_server-alias-duplicated_access_log
-T-2/var/log/httpd/_server-alias-duplicated_error_log
-T-2/var/log/httpd/_server-alias-wildcard_access_log
-T-2/var/log/httpd/_server-alias-wildcard_error_log
-T-2/var/log/httpd/_server-alias_access_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
-T-2/var/log/httpd/_server-alias_error_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
-T-2/var/log/httpd/_ssl_ca_crt_only_access_log
-T-2/var/log/httpd/_ssl_ca_crt_only_error_log
-T-2/var/log/httpd/_type-notebook_access_log
-T-2/var/log/httpd/_type-notebook_error_log
-T-2/var/log/httpd/_type-redirect_access_log
-T-2/var/log/httpd/_type-redirect_error_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_error_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_error_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_error_log
-T-2/var/log/httpd/_type-websocket_access_log
-T-2/var/log/httpd/_type-websocket_error_log
-T-2/var/log/httpd/_type-zope-default-path_access_log
-T-2/var/log/httpd/_type-zope-default-path_error_log
-T-2/var/log/httpd/_type-zope-path_access_log
-T-2/var/log/httpd/_type-zope-path_error_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
-T-2/var/log/httpd/_type-zope_access_log
-T-2/var/log/httpd/_type-zope_error_log
-T-2/var/log/httpd/_url_https-url_access_log
-T-2/var/log/httpd/_url_https-url_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestSlave.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
-T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestSlave.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestSlave.test_master_partition_state-CADDY.txt

-SetEnvIf Origin "^http(s)?://(.+\.)?(monitor\.app\.officejs\.com)$" ORIGIN_DOMAIN=$0
-Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
-Header always set Access-Control-Allow-Credentials "true" env=ORIGIN_DOMAIN
-Header always 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" env=ORIGIN_DOMAIN
-Header always 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" env=ORIGIN_DOMAIN

software/caddy-frontend/test/test_data/test.test.TestSlave.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestSlaveCiphers.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestSlaveCiphers.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_default_ciphers_access_log
-T-2/var/log/httpd-cache-direct/_default_ciphers_error_log
-T-2/var/log/httpd-cache-direct/_own_ciphers_access_log
-T-2/var/log/httpd-cache-direct/_own_ciphers_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_default_ciphers_access_log
-T-2/var/log/httpd/_default_ciphers_error_log
-T-2/var/log/httpd/_own_ciphers_access_log
-T-2/var/log/httpd/_own_ciphers_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestSlaveCiphers.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestSlaveCiphers.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestSlaveCiphers.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestSlaveGlobalDisableHttp2.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestSlaveGlobalDisableHttp2.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_error_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_access_log
-T-2/var/log/httpd-cache-direct/_enable_cache_server_alias_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_Url_access_log
-T-2/var/log/httpd/_Url_error_log
-T-2/var/log/httpd/_ciphers_access_log
-T-2/var/log/httpd/_ciphers_error_log
-T-2/var/log/httpd/_custom_domain_access_log
-T-2/var/log/httpd/_custom_domain_error_log
-T-2/var/log/httpd/_custom_domain_server_alias_access_log
-T-2/var/log/httpd/_custom_domain_server_alias_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
-T-2/var/log/httpd/_custom_domain_wildcard_access_log
-T-2/var/log/httpd/_custom_domain_wildcard_error_log
-T-2/var/log/httpd/_disabled-cookie-list_access_log
-T-2/var/log/httpd/_disabled-cookie-list_error_log
-T-2/var/log/httpd/_empty_access_log
-T-2/var/log/httpd/_empty_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_enable_cache-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_enable_cache_access_log
-T-2/var/log/httpd/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd/_enable_cache_error_log
-T-2/var/log/httpd/_enable_cache_server_alias_access_log
-T-2/var/log/httpd/_enable_cache_server_alias_error_log
-T-2/var/log/httpd/_https-only_access_log
-T-2/var/log/httpd/_https-only_error_log
-T-2/var/log/httpd/_monitor-ipv4-test_access_log
-T-2/var/log/httpd/_monitor-ipv4-test_error_log
-T-2/var/log/httpd/_monitor-ipv6-test_access_log
-T-2/var/log/httpd/_monitor-ipv6-test_error_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_error_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_server-alias-duplicated_access_log
-T-2/var/log/httpd/_server-alias-duplicated_error_log
-T-2/var/log/httpd/_server-alias-wildcard_access_log
-T-2/var/log/httpd/_server-alias-wildcard_error_log
-T-2/var/log/httpd/_server-alias_access_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
-T-2/var/log/httpd/_server-alias_error_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
-T-2/var/log/httpd/_ssl_ca_crt_only_access_log
-T-2/var/log/httpd/_ssl_ca_crt_only_error_log
-T-2/var/log/httpd/_type-notebook_access_log
-T-2/var/log/httpd/_type-notebook_error_log
-T-2/var/log/httpd/_type-redirect_access_log
-T-2/var/log/httpd/_type-redirect_error_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_error_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_error_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_error_log
-T-2/var/log/httpd/_type-websocket_access_log
-T-2/var/log/httpd/_type-websocket_error_log
-T-2/var/log/httpd/_type-zope-default-path_access_log
-T-2/var/log/httpd/_type-zope-default-path_error_log
-T-2/var/log/httpd/_type-zope-path_access_log
-T-2/var/log/httpd/_type-zope-path_error_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_type-zope-ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
-T-2/var/log/httpd/_type-zope_access_log
-T-2/var/log/httpd/_type-zope_error_log
-T-2/var/log/httpd/_url_https-url_access_log
-T-2/var/log/httpd/_url_https-url_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestSlaveGlobalDisableHttp2.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py
-T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestSlaveGlobalDisableHttp2.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestSlaveGlobalDisableHttp2.test_master_partition_state-CADDY.txt

-SetEnvIf Origin "^http(s)?://(.+\.)?(monitor\.app\.officejs\.com)$" ORIGIN_DOMAIN=$0
-Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN
-Header always set Access-Control-Allow-Credentials "true" env=ORIGIN_DOMAIN
-Header always 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" env=ORIGIN_DOMAIN
-Header always 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" env=ORIGIN_DOMAIN

software/caddy-frontend/test/test_data/test.test.TestSlaveGlobalDisableHttp2.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
-T-2/var/log/httpd/_ssl_from_master_access_log
-T-2/var/log/httpd/_ssl_from_master_error_log
-T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_access_log
-T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_error_log
-T-2/var/log/httpd/_ssl_from_slave_access_log
-T-2/var/log/httpd/_ssl_from_slave_error_log
-T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_access_log
-T-2/var/log/httpd/_ssl_from_slave_kedifa_overrides_error_log
-T-2/var/log/httpd/_type-notebook-ssl_from_master_access_log
-T-2/var/log/httpd/_type-notebook-ssl_from_master_error_log
-T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_access_log
-T-2/var/log/httpd/_type-notebook-ssl_from_master_kedifa_overrides_error_log
-T-2/var/log/httpd/_type-notebook-ssl_from_slave_access_log
-T-2/var/log/httpd/_type-notebook-ssl_from_slave_error_log
-T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_access_log
-T-2/var/log/httpd/_type-notebook-ssl_from_slave_kedifa_overrides_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_kedifa_overrides_master_certificate_access_log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_kedifa_overrides_master_certificate_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_access_log
-T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_etc_cron_d-CADDY.txt

-T-0/etc/cron.d/logrotate
-T-0/etc/cron.d/monitor-configurator
-T-0/etc/cron.d/monitor-globalstate
-T-0/etc/cron.d/monitor_collect
-T-1/etc/cron.d/logrotate
-T-1/etc/cron.d/monitor-configurator
-T-1/etc/cron.d/monitor-globalstate
-T-1/etc/cron.d/monitor_collect
-T-2/etc/cron.d/logrotate
-T-2/etc/cron.d/monitor-configurator
-T-2/etc/cron.d/monitor-globalstate
-T-2/etc/cron.d/monitor_collect
-T-2/etc/cron.d/trafficserver-logrotate

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_log-CADDY.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr_id.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_access_log
-T-2/var/log/httpd-cache-direct/_ssl_from_master_error_log
-T-2/var/log/httpd-csr_id/expose-csr_id.log
-T-2/var/log/httpd/_ssl_from_master_access_log
-T-2/var/log/httpd/_ssl_from_master_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/trafficserver/manager.log
-T-2/var/log/trafficserver/traffic.out

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_plugin-CADDY.txt

-T-0/etc/plugin/__init__.py
-T-0/etc/plugin/aikc-user-caucase-updater.py
-T-0/etc/plugin/buildout-T-0-status.py
-T-0/etc/plugin/check-free-disk-space.py
-T-0/etc/plugin/monitor-bootstrap-status.py
-T-0/etc/plugin/monitor-http-frontend.py
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py
-T-0/etc/plugin/rejected-slave.py
-T-1/etc/plugin/__init__.py
-T-1/etc/plugin/buildout-T-1-status.py
-T-1/etc/plugin/caucased.py
-T-1/etc/plugin/check-free-disk-space.py
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py
-T-1/etc/plugin/kedifa-http-reply.py
-T-1/etc/plugin/monitor-bootstrap-status.py
-T-1/etc/plugin/monitor-http-frontend.py
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/__init__.py
-T-2/etc/plugin/buildout-T-2-status.py
-T-2/etc/plugin/caddy_cached.py
-T-2/etc/plugin/caddy_frontend_ipv4_http.py
-T-2/etc/plugin/caddy_frontend_ipv4_https.py
-T-2/etc/plugin/caddy_frontend_ipv6_http.py
-T-2/etc/plugin/caddy_frontend_ipv6_https.py
-T-2/etc/plugin/caddy_ssl_cached.py
-T-2/etc/plugin/caucase-updater.py
-T-2/etc/plugin/check-free-disk-space.py
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py
-T-2/etc/plugin/frontend-caddy-configuration-promise.py
-T-2/etc/plugin/monitor-bootstrap-status.py
-T-2/etc/plugin/monitor-http-frontend.py
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
-T-2/etc/plugin/re6st-connectivity.py
-T-2/etc/plugin/trafficserver-cache-availability.py
-T-2/etc/plugin/trafficserver-port-listening.py

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run-CADDY.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid

software/caddy-frontend/test/test_data/test.test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state-CADDY.txt

-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26011-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-26012-{hash-generic}-on-watch RUNNING
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr_id-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/gitlab/buildout.hash.cfg

@@ -62,7 +62,7 @@ md5sum = 2af7dcf63f74e5edc53a3ff11fa4989b
 
 [instance-gitlab-test.cfg.in]
 _update_hash_filename_ = instance-gitlab-test.cfg.in
-md5sum = a4ad76856db98e508af7e773d9ff78f9
+md5sum = 60714fb4e6c869c41bd5e9fada1b6e40
 
 [macrolib.cfg.in]
 _update_hash_filename_ = macrolib.cfg.in

software/gitlab/instance-gitlab-test.cfg.in

 [buildout]
 extends = 
-  {{ instance_gitlab_cfg }}
   {{ instance_gitlab_export_cfg }}
 
 parts +=

software/metabase/software.cfg

@@ -17,8 +17,8 @@ part = python3
 
 [metabase.jar]
 recipe = slapos.recipe.build:download
-url = https://downloads.metabase.com/v0.35.3/metabase.jar
-md5sum = 73c98cdf5cecde80463ef868e77d3b0e
+url = https://downloads.metabase.com/v0.36.0/metabase.jar
+md5sum = 0a5e780dcf7d9ffe73f1ed789f863a57
 
 [instance-profile]
 recipe = slapos.recipe.template

software/powerdns/buildout.hash.cfg

@@ -14,24 +14,24 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = da8be58db4255c07750f7a7583eab3ca
+md5sum = fddea033e1aa9d6147a1a47bd7cc4b62
 
 [template-powerdns]
 filename = instance-powerdns.cfg
-md5sum = 681cd9564e491d1f7b7ccb810f8ca7df
+md5sum = 2adb91323d60fc350f52910a3257d4a7
 
 [template-pdns-configuration]
 _update_hash_filename_ = template/pdns.conf.jinja2
-md5sum = 7934b7037344678eff3031e1e73e0bb2
+md5sum = e45d72de87b4adb89c195ba463be4077
 
 [template-dns-replicate]
 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = 46acd4ed071df8d7139dcd0434be42eb
+md5sum = a23e241a236f90ae1afbb5bd5ba0b32d
 
 [iso-list]
 _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd
 md5sum = c4dc8c141d81b92d92cdb82ca67a13ee
 
-[template-cdn-conf]
-_update_hash_filename_ = template/cdn.conf.in
-md5sum = 29c29f93b3b0bd2f71f86f7b337e4543
+[template-zones-file]
+_update_hash_filename_ = template/zones-file.yml.jinja2
+md5sum = 03037141ad1d3467ae878c9798724f70

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -60,7 +60,7 @@ context =
 <= replicate
 name = {{dns_name}}
 {%   set state_key = "-dns-%s-state" % i %}
-{%   if slapparameter_dict.has_key(state_key) %}
+{%   if state_key in slapparameter_dict %}
 state = {{ slapparameter_dict.pop(state_key) }}
 {%   endif%}
 config-zone = {{ zone }}
@@ -95,7 +95,7 @@ monitor-url-list +=
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
 {% set dns_software_url_key = "-dns-software-release-url" %}
-{% if slapparameter_dict.has_key(dns_software_url_key) %}
+{% if dns_software_url_key in slapparameter_dict %}
 software-url = {{ slapparameter_dict.pop(dns_software_url_key) }}
 {% else %}
 software-url = ${slap-connection:software-release-url}
@@ -104,7 +104,7 @@ software-type = {{dns_type}}
 return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url
 config-server-admin = {{ server_admin }}
 config-ns-record = {{ ns_record }}
-{% for parameter, value in slapparameter_dict.iteritems() -%}
+{% for parameter, value in slapparameter_dict.items() -%}
 config-{{parameter}} = {{ value }}
 {% endfor -%}
 config-{{ slave_list_name }} = {{ json_module.dumps(slave_instance_list) }}
@@ -151,7 +151,7 @@ key_file = ${slap-connection:key-file}
 cert_file = ${slap-connection:cert-file}
 
 [slap-parameter]
-slave_instance_list =
--dns-quantity = 1
--dns-type = single-default
+{% for k, v in slapparameter_dict.items() -%}
+{{ k }} = {{ v }}
+{% endfor -%}
 {%- endif %}

software/powerdns/instance-powerdns.cfg

 {% if slap_software_type in software_type -%}
-{% set part_list =  [] %}
 
 # Create all needed directories
 [directory]
@@ -63,13 +62,12 @@ socket-directory = $${pdns-directory:socket}
 webserver-port = 8088
 
 [geo]
-ip-map-zonefile = ${iso-list:target}
-geo-maps = $${pdns-directory:geo-maps}
+zones-file = $${zones-file-template:rendered}
+database = ${geolite2-country:location}/GeoLite2-Country.mmdb
 
 [pdns-directory]
 recipe = slapos.cookbook:mkdirectory
 configuration = $${directory:etc}/pdns
-geo-maps = $${:configuration}/geo-maps
 socket = $${directory:run}/pdns-socket
 
 [pdns-configuration-template]
@@ -80,6 +78,39 @@ extra-context =
   section pdns pdns
   section geo geo
 
+[asia]
+japan = jp
+hong-kong = hk
+china-telecom = cn-t
+china-unicom = cn-u
+china-mobile = cn-m
+west-asia = ae af am az bh cc cy ge il iq ir jo kg kw kz lb om pk qa ru sa sy tj tm tr uz ye
+east-asia = bn bt cx id in io kh kp kr la lk mm mn mo mv my np ph sg th to tw vn
+
+[china]
+recipe = slapos.recipe.build
+iso-list = ${iso-list:target}
+init =
+  import re
+  ip_split = []
+  match = re.compile(r"(.*) :.*:(cn-\w)\n").fullmatch
+  with open(options["iso-list"]) as f:
+    for line in f:
+      m = match(line)
+      if m is None:
+        continue
+      ip_split.append(m.groups())
+  options["ip-split"] = ip_split
+
+[zones-file-template]
+< = jinja2-template-base
+template = ${template-zones-file:target}
+extensions = jinja2.ext.do
+rendered = $${pdns-directory:configuration}/zones-file.yml
+extra-context =
+  section asia asia
+  key china china:ip-split
+
 # Executables
 [pdns-server]
 recipe = slapos.cookbook:wrapper
@@ -117,29 +148,6 @@ monitor-url = $${monitor-publish-parameters:monitor-url}
 monitor-user = $${monitor-publish-parameters:monitor-user}
 monitor-password = $${monitor-publish-parameters:monitor-password}
 
-#####################
-# Power DNS Slave configuration
-#
-{% set slave_instance_list = json_module.loads(slapparameter_dict.get('extra_slave_instance_list', '[]')) %}
-
-# Iter through slave list to prepare configuration
-{% for slave in slave_instance_list %}
-{%   if 'record' in slave and 'origin' in slave and 'default' in slave %}
-{%     set slave_reference = slave.get('slave_reference') %}
-{%     set slave_section_name = 'map-configuration-%s' % slave_reference  %}
-{%     do part_list.append(slave_section_name) %}
-[{{ slave_section_name }}]
-< = jinja2-template-base
-template = ${template-cdn-conf:target}
-rendered = $${geo:geo-maps}/{{ slave_reference }}
-configuration = {{ json_module.dumps(slave) }}
-extra-context =
-  key json_cdn :configuration
-{%   endif %}
-{% endfor %}
-
-####################
-
 [buildout]
 parts =
   pdns-configuration-template
@@ -149,9 +157,6 @@ parts =
   pdns-promise-listen-port
   monitor-base
   publish-connection-informations
-{% for part in part_list %}
-{{ '  %s' % part }}
-{% endfor %}
 
 extends = ${monitor-template:output}
 

software/powerdns/instance.cfg

@@ -8,10 +8,12 @@ offline = true
 
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${dynamic-powerdns-replicate:rendered}
-single-default = $${dynamic-template-powerdns:rendered}
+recipe = slapos.cookbook:switch-softwaretype
+default = dynamic-powerdns-replicate:rendered
+single-default = dynamic-template-powerdns:rendered
 
+# BBB
+RootSoftwareInstance = $${:default}
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -21,9 +23,9 @@ context =
     import json_module json
     key eggs_directory buildout:eggs-directory
     key develop_eggs_directory buildout:develop-eggs-directory
-    key slap_software_type slap-parameters:slap-software-type
-    key slapparameter_dict slap-parameters:configuration
-    key slave_instance_list slap-parameters:slave-instance-list
+    key slap_software_type slap-configuration:slap-software-type
+    key slapparameter_dict slap-configuration:configuration
+    key slave_instance_list slap-configuration:slave-instance-list
     $${:extra-context}
 
 [dynamic-template-powerdns]
@@ -38,14 +40,14 @@ extra-context =
 [dynamic-powerdns-replicate]
 < = jinja2-template-base
 template = ${template-dns-replicate:target}
-filename = instance-apache-replicate.cfg
+filename = instance-powerdns-replicate.cfg
 extensions = jinja2.ext.do
 extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type RootSoftwareInstance-default
     raw template_monitor ${monitor2-template:rendered}
 
-[slap-parameters]
+[slap-configuration]
 recipe = slapos.cookbook:slapconfiguration
 computer = $${slap-connection:computer-id}
 partition = $${slap-connection:partition-id}

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

@@ -10,12 +10,12 @@
     },
     "origin": {
       "title": "Origin",
-      "description": "Used to qualify RR in the configuration. i.e.: if your origin is a.example.com and the RR for Europe is 'eu' the european clients will use eu.a.exmple.com",
+      "description": "Used to qualify RR in the configuration. i.e.: if your origin is a.example.com and the RR for Europe is 'eu' the european clients will use eu.a.example.com",
       "type": "string"
     },
     "default": {
       "title": "Default RR",
-      "description": "Defautl record to use when the ip is not regognized",
+      "description": "Default record to use when the ip is not recognized",
       "type": "string"
     },
     "europe": {

software/powerdns/software.cfg

@@ -10,10 +10,8 @@ parts =
   slapos-cookbook
   eggs
 
-[gcc]
-# For old version of PowerDNS and Ragel.
-part = gcc-5.5
-max_version = 6
+[python]
+part = python3
 
 [eggs]
 recipe = zc.recipe.egg
@@ -47,7 +45,7 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644
 
-[template-cdn-conf]
+[template-zones-file]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 mode = 0644

software/powerdns/template/cdn.conf.in

-{% set cdn = json_module.loads(json_cdn) %}
-
-$RECORD {{ cdn.get('record') }}
-$ORIGIN {{ cdn.get('origin') }}
-
-0 {{ cdn.get('default')}}
-
-# Andorra
-20 {{ cdn.get('europe', 'eu') }}
-# United Arab Emirates
-784 {{ cdn.get('west-asia', 'as') }}
-# Afghanistan
-4 {{ cdn.get('west-asia', 'as') }}
-# Antigua and Barbuda
-28 {{ cdn.get('south-america', 'sa') }}
-# Anguilla
-660 {{ cdn.get('south-america', 'sa') }}
-# Albania
-8 {{ cdn.get('europe', 'eu') }}
-# Armenia
-51 {{ cdn.get('west-asia', 'as') }}
-# Netherlands Antilles
-530 {{ cdn.get('south-america', 'sa') }}
-# Angola
-24 {{ cdn.get('africa', 'af') }}
-# Antarctica
-10 {{ cdn.get('europe', 'eu') }}
-# Argentina
-32 {{ cdn.get('south-america', 'sa') }}
-# American Samoa
-16 {{ cdn.get('oceania', 'oc') }}
-# Austria
-40 {{ cdn.get('europe', 'eu') }}
-# Australia
-36 {{ cdn.get('oceania', 'oc') }}
-# Aruba
-533 {{ cdn.get('south-america', 'sa') }}
-# Azerbaijan
-31 {{ cdn.get('west-asia', 'as') }}
-# Bosnia and Herzegovina
-70 {{ cdn.get('europe', 'eu') }}
-# Barbados
-52 {{ cdn.get('south-america', 'sa') }}
-# Bangladesh
-50 {{ cdn.get('east-asia', 'as') }}
-# Belgium
-56 {{ cdn.get('europe', 'eu') }}
-# Burkina Faso
-854 {{ cdn.get('africa', 'af') }}
-# Bulgaria
-100 {{ cdn.get('europe', 'eu') }}
-# Bahrain
-48 {{ cdn.get('west-asia', 'as') }}
-# Burundi
-108 {{ cdn.get('africa', 'af') }}
-# Benin
-204 {{ cdn.get('africa', 'af') }}
-# Bermuda
-60 {{ cdn.get('south-america', 'sa') }}
-# Brunei Darussalam
-96 {{ cdn.get('east-asia', 'as') }}
-# Bolivia
-68 {{ cdn.get('south-america', 'sa') }}
-# Brazil
-76 {{ cdn.get('south-america', 'sa') }}
-# Bahamas
-44 {{ cdn.get('south-america', 'sa') }}
-# Bhutan
-64 {{ cdn.get('east-asia', 'as') }}
-# Bouvet Island
-74 {{ cdn.get('africa', 'af') }}
-# Botswana
-72 {{ cdn.get('africa', 'af') }}
-# Belarus
-112 {{ cdn.get('europe', 'eu') }}
-# Belize
-84 {{ cdn.get('south-america', 'sa') }}
-# Canada
-124 {{ cdn.get('north-america', 'na') }}
-# Cocos (Keeling) Islands
-166 {{ cdn.get('west-asia', 'as') }}
-# Congo, The Democratic Republic of the
-178 {{ cdn.get('africa', 'af') }}
-# Central African Republic
-140 {{ cdn.get('africa', 'af') }}
-# Switzerland
-756 {{ cdn.get('europe', 'eu') }}
-# Cote D'Ivoire
-384 {{ cdn.get('africa', 'af') }}
-# Cook Islands
-184 {{ cdn.get('oceania', 'oc') }}
-# Chile
-152 {{ cdn.get('south-america', 'sa') }}
-# Cameroon
-120 {{ cdn.get('africa', 'af') }}
-# China telecom
-155 {{ cdn.get('china-telecom', 'cn-t') }}
-#china unicom
-156 {{ cdn.get('china-unicom', 'cn-u') }}
-#china mobile
-157 {{ cdn.get('china-mobile', 'cn-m') }}
-# Colombia
-170 {{ cdn.get('south-america', 'sa') }}
-# Costa Rica
-188 {{ cdn.get('south-america', 'sa') }}
-# Cuba
-192 {{ cdn.get('south-america', 'sa') }}
-# Cape Verde
-132 {{ cdn.get('africa', 'af') }}
-# Christmas Island
-162 {{ cdn.get('east-asia', 'as') }}
-# Cyprus
-196 {{ cdn.get('west-asia', 'as') }}
-# Czech Republic
-203 {{ cdn.get('europe', 'eu') }}
-# Germany
-276 {{ cdn.get('europe', 'eu') }}
-# Djibouti
-262 {{ cdn.get('africa', 'af') }}
-# Denmark
-208 {{ cdn.get('europe', 'eu') }}
-# Dominica
-212 {{ cdn.get('south-america', 'sa') }}
-# Dominican Republic
-214 {{ cdn.get('south-america', 'sa') }}
-# Algeria
-12 {{ cdn.get('africa', 'af') }}
-# Ecuador
-218 {{ cdn.get('south-america', 'sa') }}
-# Estonia
-233 {{ cdn.get('europe', 'eu') }}
-# Egypt
-818 {{ cdn.get('africa', 'af') }}
-# Western Sahara
-732 {{ cdn.get('africa', 'af') }}
-# Eritrea
-232 {{ cdn.get('africa', 'af') }}
-# Spain
-724 {{ cdn.get('europe', 'eu') }}
-# Ethiopia
-210 {{ cdn.get('africa', 'af') }}
-# Finland
-246 {{ cdn.get('europe', 'eu') }}
-# Fiji
-242 {{ cdn.get('oceania', 'oc') }}
-# Falkland Islands (Malvinas)
-238 {{ cdn.get('south-america', 'sa') }}
-# Micronesia, Federated States of
-583 {{ cdn.get('oceania', 'oc') }}
-# Faroe Islands
-234 {{ cdn.get('europe', 'eu') }}
-# France
-250 {{ cdn.get('europe', 'eu') }}
-# France, Metropolitan
-249 {{ cdn.get('europe', 'eu') }}
-# Gabon
-266 {{ cdn.get('africa', 'af') }}
-# United Kingdom
-826 {{ cdn.get('europe', 'eu') }}
-# Grenada
-308 {{ cdn.get('south-america', 'sa') }}
-# Georgia
-268 {{ cdn.get('west-asia', 'as') }}
-# French Guiana
-254 {{ cdn.get('south-america', 'sa') }}
-# Ghana
-288 {{ cdn.get('africa', 'af') }}
-# Gibraltar
-292 {{ cdn.get('europe', 'eu') }}
-# Greenland
-304 {{ cdn.get('south-america', 'sa') }}
-# Gambia
-270 {{ cdn.get('africa', 'af') }}
-# Guinea
-324 {{ cdn.get('africa', 'af') }}
-# Guadeloupe
-312 {{ cdn.get('south-america', 'sa') }}
-# Equatorial Guinea
-226 {{ cdn.get('africa', 'af') }}
-# Greece
-300 {{ cdn.get('europe', 'eu') }}
-# Guatemala
-320 {{ cdn.get('south-america', 'sa') }}
-# Guam
-316 {{ cdn.get('oceania', 'oc') }}
-# Guinea-Bissau
-624 {{ cdn.get('africa', 'af') }}
-# Guyana
-328 {{ cdn.get('south-america', 'sa') }}
-# Hong Kong
-344 {{ cdn.get('hong-kong', 'hk') }}
-# Heard Island and McDonald Islands
-334 {{ cdn.get('africa', 'af') }}
-# Honduras
-340 {{ cdn.get('south-america', 'sa') }}
-# Croatia
-191 {{ cdn.get('europe', 'eu') }}
-# Haiti
-332 {{ cdn.get('south-america', 'sa') }}
-# Hungary
-348 {{ cdn.get('europe', 'eu') }}
-# Indonesia
-360 {{ cdn.get('east-asia', 'as') }}
-# Ireland
-372 {{ cdn.get('europe', 'eu') }}
-# Israel
-376 {{ cdn.get('west-asia', 'as') }}
-# India
-356 {{ cdn.get('east-asia', 'as') }}
-# British Indian Ocean Territory
-86 {{ cdn.get('east-asia', 'as') }}
-# Iraq
-368 {{ cdn.get('west-asia', 'as') }}
-# Iran, Islamic Republic of
-364 {{ cdn.get('west-asia', 'as') }}
-# Iceland
-352 {{ cdn.get('europe', 'eu') }}
-# Italy
-380 {{ cdn.get('europe', 'eu') }}
-# Jamaica
-388 {{ cdn.get('south-america', 'sa') }}
-# Jordan
-400 {{ cdn.get('west-asia', 'as') }}
-# Japan
-392 {{ cdn.get('japan', 'jp') }}
-# Kenya
-404 {{ cdn.get('africa', 'af') }}
-# Kyrgyzstan
-417 {{ cdn.get('west-asia', 'as') }}
-# Cambodia
-116 {{ cdn.get('east-asia', 'as') }}
-# Kiribati
-296 {{ cdn.get('oceania', 'oc') }}
-# Comoros
-174 {{ cdn.get('africa', 'af') }}
-# Saint Kitts and Nevis
-659 {{ cdn.get('south-america', 'sa') }}
-# Korea, Democratic People's Republic of
-408 {{ cdn.get('east-asia', 'as') }}
-# Korea, Republic of
-410 {{ cdn.get('east-asia', 'as') }}
-# Kuwait
-414 {{ cdn.get('west-asia', 'as') }}
-# Cayman Islands
-136 {{ cdn.get('south-america', 'sa') }}
-# Kazakhstan
-398 {{ cdn.get('west-asia', 'as') }}
-# Lao People's Democratic Republic
-418 {{ cdn.get('east-asia', 'as') }}
-# Lebanon
-422 {{ cdn.get('west-asia', 'as') }}
-# Saint Lucia
-662 {{ cdn.get('south-america', 'sa') }}
-# Liechtenstein
-438 {{ cdn.get('europe', 'eu') }}
-# Sri Lanka
-144 {{ cdn.get('east-asia', 'as') }}
-# Liberia
-430 {{ cdn.get('africa', 'af') }}
-# Lesotho
-426 {{ cdn.get('africa', 'af') }}
-# Lithuania
-440 {{ cdn.get('europe', 'eu') }}
-# Luxembourg
-442 {{ cdn.get('europe', 'eu') }}
-# Latvia
-428 {{ cdn.get('europe', 'eu') }}
-# Libyan Arab Jamahiriya
-434 {{ cdn.get('africa', 'af') }}
-# Morocco
-504 {{ cdn.get('africa', 'af') }}
-# Monaco
-492 {{ cdn.get('europe', 'eu') }}
-# Moldova, Republic of
-498 {{ cdn.get('europe', 'eu') }}
-# Madagascar
-450 {{ cdn.get('africa', 'af') }}
-# Marshall Islands
-584 {{ cdn.get('oceania', 'oc') }}
-# Macedonia, the Former Yugoslav Republic of
-807 {{ cdn.get('europe', 'eu') }}
-# Mali
-466 {{ cdn.get('africa', 'af') }}
-# Myanmar
-104 {{ cdn.get('east-asia', 'as') }}
-# Mongolia
-496 {{ cdn.get('east-asia', 'as') }}
-# Macao
-446 {{ cdn.get('east-asia', 'as') }}
-# Northern Mariana Islands
-580 {{ cdn.get('oceania', 'oc') }}
-# Martinique
-474 {{ cdn.get('south-america', 'sa') }}
-# Mauritania
-478 {{ cdn.get('africa', 'af') }}
-# Montserrat
-500 {{ cdn.get('south-america', 'sa') }}
-# Malta
-470 {{ cdn.get('europe', 'eu') }}
-# Mauritius
-480 {{ cdn.get('africa', 'af') }}
-# Maldives
-462 {{ cdn.get('east-asia', 'as') }}
-# Malawi
-454 {{ cdn.get('africa', 'af') }}
-# Mexico
-484 {{ cdn.get('north-america', 'na') }}
-# Malaysia
-458 {{ cdn.get('east-asia', 'as') }}
-# Mozambique
-508 {{ cdn.get('africa', 'af') }}
-# Namibia
-516 {{ cdn.get('africa', 'af') }}
-# New Caledonia
-540 {{ cdn.get('oceania', 'oc') }}
-# Niger
-562 {{ cdn.get('africa', 'af') }}
-# Norfolk Island
-574 {{ cdn.get('oceania', 'oc') }}
-# Nigeria
-566 {{ cdn.get('africa', 'af') }}
-# Nicaragua
-558 {{ cdn.get('south-america', 'sa') }}
-# Netherlands
-528 {{ cdn.get('europe', 'eu') }}
-# Norway
-578 {{ cdn.get('europe', 'eu') }}
-# Nepal
-524 {{ cdn.get('east-asia', 'as') }}
-# Nauru
-520 {{ cdn.get('oceania', 'oc') }}
-# Niue
-570 {{ cdn.get('oceania', 'oc') }}
-# New Zealand
-554 {{ cdn.get('oceania', 'oc') }}
-# Oman
-512 {{ cdn.get('west-asia', 'as') }}
-# Panama
-591 {{ cdn.get('south-america', 'sa') }}
-# Peru
-604 {{ cdn.get('south-america', 'sa') }}
-# French Polynesia
-258 {{ cdn.get('oceania', 'oc') }}
-# Papua New Guinea
-598 {{ cdn.get('oceania', 'oc') }}
-# Philippines
-608 {{ cdn.get('east-asia', 'as') }}
-# Pakistan
-586 {{ cdn.get('west-asia', 'as') }}
-# Poland
-616 {{ cdn.get('europe', 'eu') }}
-# Saint Pierre and Miquelon
-666 {{ cdn.get('south-america', 'sa') }}
-# Pitcairn
-612 {{ cdn.get('oceania', 'oc') }}
-# Puerto Rico
-630 {{ cdn.get('south-america', 'sa') }}
-# Portugal
-620 {{ cdn.get('europe', 'eu') }}
-# Palau
-585 {{ cdn.get('oceania', 'oc') }}
-# Paraguay
-600 {{ cdn.get('south-america', 'sa') }}
-# Qatar
-634 {{ cdn.get('west-asia', 'as') }}
-# Reunion
-638 {{ cdn.get('africa', 'af') }}
-# Romania
-642 {{ cdn.get('europe', 'eu') }}
-# Russian Federation
-643 {{ cdn.get('west-asia', 'as') }}
-# Rwanda
-646 {{ cdn.get('africa', 'af') }}
-# Saudi Arabia
-682 {{ cdn.get('west-asia', 'as') }}
-# Solomon Islands
-90 {{ cdn.get('oceania', 'oc') }}
-# Seychelles
-690 {{ cdn.get('africa', 'af') }}
-# Sudan
-736 {{ cdn.get('africa', 'af') }}
-# Sweden
-752 {{ cdn.get('europe', 'eu') }}
-# Singapore
-702 {{ cdn.get('east-asia', 'as') }}
-# Saint Helena
-654 {{ cdn.get('africa', 'af') }}
-# Slovenia
-705 {{ cdn.get('europe', 'eu') }}
-# Svalbard and Jan Mayen
-744 {{ cdn.get('europe', 'eu') }}
-# Slovakia
-703 {{ cdn.get('europe', 'eu') }}
-# Sierra Leone
-694 {{ cdn.get('africa', 'af') }}
-# San Marino
-674 {{ cdn.get('europe', 'eu') }}
-# Senegal
-686 {{ cdn.get('africa', 'af') }}
-# Somalia
-706 {{ cdn.get('africa', 'af') }}
-# Suriname
-740 {{ cdn.get('south-america', 'sa') }}
-# Sao Tome and Principe
-678 {{ cdn.get('africa', 'af') }}
-# El Salvador
-222 {{ cdn.get('south-america', 'sa') }}
-# Syrian Arab Republic
-760 {{ cdn.get('west-asia', 'as') }}
-# Swaziland
-748 {{ cdn.get('africa', 'af') }}
-# Turks and Caicos Islands
-796 {{ cdn.get('south-america', 'sa') }}
-# Chad
-148 {{ cdn.get('africa', 'af') }}
-# French Southern Territories
-260 {{ cdn.get('africa', 'af') }}
-# Togo
-768 {{ cdn.get('africa', 'af') }}
-# Thailand
-764 {{ cdn.get('east-asia', 'as') }}
-# Tajikistan
-762 {{ cdn.get('west-asia', 'as') }}
-# Tokelau
-772 {{ cdn.get('oceania', 'oc') }}
-# Turkmenistan
-795 {{ cdn.get('west-asia', 'as') }}
-# Tonga
-788 {{ cdn.get('oceania', 'oc') }}
-# East Timor
-776 {{ cdn.get('east-asia', 'as') }}
-# Turkey
-792 {{ cdn.get('west-asia', 'as') }}
-# Trinidad and Tobago
-780 {{ cdn.get('south-america', 'sa') }}
-# Tuvalu
-798 {{ cdn.get('oceania', 'oc') }}
-# Taiwan
-158 {{ cdn.get('east-asia', 'as') }}
-# Tanzania, United Republic of
-834 {{ cdn.get('africa', 'af') }}
-# Ukraine
-804 {{ cdn.get('europe', 'eu') }}
-# Uganda
-800 {{ cdn.get('africa', 'af') }}
-# United States Minor Outlying Islands
-581 {{ cdn.get('oceania', 'oc') }}
-# United States
-840 {{ cdn.get('north-america', 'na') }}
-# Uruguay
-858 {{ cdn.get('south-america', 'sa') }}
-# Uzbekistan
-860 {{ cdn.get('west-asia', 'as') }}
-# Holy See (Vatican City State)
-336 {{ cdn.get('europe', 'eu') }}
-# Saint Vincent and the Grenadines
-670 {{ cdn.get('south-america', 'sa') }}
-# Venezuela
-862 {{ cdn.get('south-america', 'sa') }}
-# Virgin Islands, British
-92 {{ cdn.get('south-america', 'sa') }}
-# Virgin Islands, U.S.
-850 {{ cdn.get('south-america', 'sa') }}
-# Vietnam
-704 {{ cdn.get('east-asia', 'as') }}
-# Vanuatu
-548 {{ cdn.get('oceania', 'oc') }}
-# Wallis and Futuna
-876 {{ cdn.get('oceania', 'oc') }}
-# Samoa
-882 {{ cdn.get('oceania', 'oc') }}
-# Yemen
-887 {{ cdn.get('west-asia', 'as') }}
-# Mayotte
-175 {{ cdn.get('africa', 'af') }}
-# Yugoslavia
-891 {{ cdn.get('europe', 'eu') }}
-# South Africa
-710 {{ cdn.get('africa', 'af') }}
-# Zambia
-894 {{ cdn.get('africa', 'af') }}
-# Zaire
-180 {{ cdn.get('africa', 'af') }}
-# Zimbabwe
-716 {{ cdn.get('africa', 'af') }}

software/powerdns/template/pdns.conf.jinja2

@@ -31,7 +31,8 @@ cache-ttl=0
 # things are working. :)
 log-dns-details=yes
 log-dns-queries=yes
-log-failed-updates=yes
+# https://github.com/PowerDNS/pdns/commit/df9d980
+# log-failed-updates=yes
 loglevel=4
 
 # This disables wildcards which is more efficient.  geobackend doesn't use
@@ -40,52 +41,11 @@ loglevel=4
 # wildcards=no
 
 # The geobackend
-launch=geo
+launch=geoip
 
-# The zone that your geo-balanced RR is inside of.  The whole zone has to be
-# delegated to the PowerDNS backend, so you will generally want to make up some
-# subzone of your main zone.  We chose "geo.blitzed.org".
-#
-geo-zone={{ slapparameter_dict.get('zone', 'example.com') }}
-
-# The only parts of the SOA for "geo.blitzed.org" that apply here are the
-# master server name and the contact address.
-geo-soa-values={{ slapparameter_dict.get('soa', 'ns0.example.com,admin@example.com') }}
-
-# List of NS records of the PowerDNS servers that are authoritative for your
-# GLB zone.
-geo-ns-records={{ slapparameter_dict.get('ns-record', 'ns0.example.com,ns1.example.com') }}
-
-# The TTL of the CNAME records that geobackend will return.  Since the same
-# resolver will always get the same CNAME (apart from if the director-map
-# changes) it is safe to return a reasonable TTL, so if you leave this
-# commented then a sane default will be chosen.
-#geo-ttl=3600
-
-# The TTL of the NS records that will be returned.  Leave this commented if you
-# don't understand.
-#geo-ns-ttl=86400
-
-# This is the real guts of the data that drives this backend.  This is a DNS
-# zone file for RBLDNSD, a nameserver specialised for running large DNS zones
-# typical of DNSBLs and such.  We choose it for our data because it is easier
-# to parse than the BIND-format one.
-#
-# Anyway, it comes from http://countries.nerd.dk/more.html - there are details
-# there for how to rsync your own copy.  You'll want to do that regularly,
-# every couple of days maybe.  We believe the nerd.dk guys take the netblock
-# info from Regional Internet Registries (RIRs) like RIPE, ARIN, APNIC.  From
-# that they build a big zonefile of IP/prefixlen -> ISO-country-code mappings.
-geo-ip-map-zonefile={{  geo.get('ip-map-zonefile') }}
+edns-subnet-processing=yes
 
-# And finally this last directive tells the geobackend where to find the map
-# files that say a) which RR to answer for, and b) what actual resource record
-# to return for each ISO country code.  The setting here is a comma-separated
-# list of paths, each of which may either be a single map file or a directory
-# that will contain map files.  If you are only ever going to serve one RR then
-# a single file is probably better, but if you're going to serve many then a
-# directory would probably be better.  The rest of this documentation will
-# assume you chose a directory.
-geo-maps={{  geo.get('geo-maps') }}
+geoip-database-files={{ geo['database'] }}
+geoip-zones-file={{ geo['zones-file'] }}
 
 # -------------------------------------------------------------------------
\ No newline at end of file

software/powerdns/template/zones-file.yml.jinja2

+# See https://doc.powerdns.com/authoritative/backends/geoip.html
+
+{%- set slave_instance_list = json_module.loads(slapparameter_dict.get('extra_slave_instance_list', '[]')) %}
+{%- set zone = slapparameter_dict.get('zone', 'example.com') %}
+
+{%- macro disambiguate_domain_name(a, b) %}
+{#- See http://www.dns-sd.org/trailingdotsindomainnames.html #}
+{%- if a.endswith('.') %}
+{{- a[:-1] }}
+{%- else %}
+{{- a }}.{{ b }}
+{%- endif %}
+{%- endmacro %}
+
+domains:
+- domain: {{ zone }}
+  # TODO: what value for ttl?
+  ttl: 300
+
+  # Note: For each domain, one record of the domain name MUST exist with a soa record.
+  records:
+    {{ zone }}:
+      - soa: {{ slapparameter_dict.get('soa', 'ns0.example.com,admin@example.com').replace(',', ' ') }}
+      {%- for ns in slapparameter_dict.get('ns-record', 'ns0.example.com,ns1.example.com').split(',') %}
+      - ns: {{ ns }}
+      {%- endfor %}
+
+    {#- Split the world the way we prefer. 'GeoLite2-Country.mmdb' divides the
+        world into 7 continents: Oceania, Asia, Europe, South America,
+        North America, Africa and Antarctica. However, we also want a more
+        fine-grained division for Asia, i.e. West/East, China, Hong-Kong and
+        Japan. #}
+    {%- set world_split = {
+          "continent": {
+            "eu": "europe",
+            "af": "africa",
+            "sa": "south-america",
+            "na": "north-america",
+            "oc": "oceania",
+          },
+          "country": {}} %}
+
+    {%- for region, codes in asia.items() %}
+    {%-   for country_code in codes.split() %}
+    {%-     do world_split["country"].__setitem__(country_code, region) %}
+    {%-   endfor %}
+    {%- endfor %}
+
+    {%- for slave in slave_instance_list %}
+
+    {%-   set origin = slave['origin'] %}
+    {%-   set unique_slave_id = slave['slave_reference'] %}
+    {#-   Set the RR to use for each region, as described in
+          'slave-instance-powerdns-input-schema.json' #}
+    {%-   set rr_dict = {} %}
+    {%-   for region, default_rr in {"europe": "eu",
+                                     "africa": "af",
+                                     "south-america": "sa",
+                                     "north-america": "na",
+                                     "china-telecom": "cn-t",
+                                     "china-unicom": "cn-u",
+                                     "china-mobile": "cn-m",
+                                     "japan": "jp",
+                                     "hong-kong": "hk",
+                                     "east-asia": "as",
+                                     "west-asia": "eu",
+                                     "oceania": "oc"}.items() %}
+    {%-     do rr_dict.__setitem__(region, slave.get(region, default_rr)) %}
+    {%-   endfor %}
+
+    {#-   'code2region' maps an ISO3166 country/continent code (i.e. the client
+          origin) to a geographical region. The latter is then used to find the
+          right RR (thanks to 'rr_dict') #}
+    {%-   for placeholder, code2region in world_split.items() %}
+    {%-     for code, region in code2region.items() %}
+    {{ code }}.{{ placeholder }}.{{ unique_slave_id }}:
+      - cname: {{ disambiguate_domain_name(rr_dict[region], origin) }}
+    {%-     endfor %}
+    {%-   endfor %}
+    {%- endfor %}
+
+  services:
+    {%- for slave in slave_instance_list %}
+    {%-   set origin = slave['origin'] %}
+    {%-   set unique_slave_id = slave['slave_reference'] %}
+    {{ disambiguate_domain_name(slave['record'], zone) }}:
+      {#- Note: Placeholders (i.e. "country." and "continent.") are used to avoid
+          possible name collisions, e.g.:
+          - %cc for American Samoa is 'as'
+          - %cn for Asia is also 'as' #}
+      default: ['%cc.country.{{ unique_slave_id }}', '%cn.continent.{{ unique_slave_id }}', '{{ disambiguate_domain_name(slave['default'], origin) }}']
+
+      # Split China's ip addresses according to ISP
+      {%- for ip_range, country_code in china %}
+      {{ ip_range }}: {{ country_code }}.country.{{ unique_slave_id }}
+      {%- endfor %}
+    {%- endfor %}

software/slapos-sr-testing/software-py3.cfg

@@ -13,3 +13,4 @@ eggs -=
 [template]
 extra =
   ${slapos.test.monitor-setup:setup}
+  ${slapos.test.powerdns-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -254,7 +254,6 @@ extra =
   ${slapos.test.htmlvalidatorserver-setup:setup}
   ${slapos.test.slapos-master-setup:setup}
   ${slapos.test.plantuml-setup:setup}
-  ${slapos.test.powerdns-setup:setup}
   ${slapos.test.proftpd-setup:setup}
   ${slapos.test.re6stnet-setup:setup}
   ${slapos.test.seleniumserver-setup:setup}

software/slaprunner/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = f2e2493bc5da90a53f86e5bcf64d2d57
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = a582be15f0fb797fc75cfc39cd1d12ab
+md5sum = f5abd8aeb19707dfa12d979a8bc30076
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in

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

@@ -112,7 +112,7 @@ recipe = collective.recipe.template
 input = inline: #!/bin/sh
   EXIT_CODE_FILE="${importer:restore-exit-code-file}"
   RECENT_EXIT_CODE_FILE=$(find ${directory:srv} -maxdepth 1 -name "${importer:restore-exit-code-file-basename}" -mtime -2)
-  RESILIENT_LOG_URL=${monitor-publish-parameters:monitor-base-url}/log/${importer:resilient-log-basename}
+  RESILIENT_LOG_URL=${monitor-publish-parameters:monitor-base-url}/share/private/log/${importer:resilient-log-basename}
   if [ ! -f "$EXIT_CODE_FILE" ]; then
     exit 0;
   else

software/theia/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 42d21dc3f5d3e57e142eea8e016195f0
+md5sum = d8ad39bc93c492026a93c28b33a5dc3a
 
 [yarn.lock]
 filename = yarn.lock
-md5sum = ae1b596804715acd3512f1e8e6cbae3b
+md5sum = 89d0a4d0c3ae90b9c5c0923b57766f0f
 
 [python-language-server-requirements.txt]
 filename = python-language-server-requirements.txt

software/theia/gowork.cfg

-# Code generated by gowork-snapshot; DO NOT EDIT.
-
-# list of go git repositories to fetch
-[gowork.goinstall]
-depends_gitfetch  =
-    ${go_github.com_9fans_go:recipe}
-    ${go_github.com_acroca_go-symbols:recipe}
-    ${go_github.com_alecthomas_gometalinter:recipe}
-    ${go_github.com_alecthomas_units:recipe}
-    ${go_github.com_beorn7_perks:recipe}
-    ${go_github.com_cosiner_argv:recipe}
-    ${go_github.com_cweill_gotests:recipe}
-    ${go_github.com_davidrjenni_reftools:recipe}
-    ${go_github.com_derekparker_delve:recipe}
-    ${go_github.com_fatih_camelcase:recipe}
-    ${go_github.com_fatih_gomodifytags:recipe}
-    ${go_github.com_fatih_structtag:recipe}
-    ${go_github.com_flynn_go-shlex:recipe}
-    ${go_github.com_gogo_protobuf:recipe}
-    ${go_github.com_golang_lint:recipe}
-    ${go_github.com_golang_protobuf:recipe}
-    ${go_github.com_google_shlex:recipe}
-    ${go_github.com_google_uuid:recipe}
-    ${go_github.com_hashicorp_golang-lru:recipe}
-    ${go_github.com_haya14busa_goplay:recipe}
-    ${go_github.com_josharian_impl:recipe}
-    ${go_github.com_karrick_godirwalk:recipe}
-    ${go_github.com_kisielk_gotool:recipe}
-    ${go_github.com_mattn_go-isatty:recipe}
-    ${go_github.com_mattn_go-runewidth:recipe}
-    ${go_github.com_matttproud_golang_protobuf_extensions:recipe}
-    ${go_github.com_mholt_caddy:recipe}
-    ${go_github.com_neelance_parallel:recipe}
-    ${go_github.com_nicksnyder_go-i18n:recipe}
-    ${go_github.com_nsf_gocode:recipe}
-    ${go_github.com_opentracing_basictracer-go:recipe}
-    ${go_github.com_opentracing_opentracing-go:recipe}
-    ${go_github.com_pelletier_go-toml:recipe}
-    ${go_github.com_peterh_liner:recipe}
-    ${go_github.com_pkg_errors:recipe}
-    ${go_github.com_pmezard_go-difflib:recipe}
-    ${go_github.com_prometheus_client_golang:recipe}
-    ${go_github.com_prometheus_client_model:recipe}
-    ${go_github.com_prometheus_common:recipe}
-    ${go_github.com_prometheus_procfs:recipe}
-    ${go_github.com_ramya-rao-a_go-outline:recipe}
-    ${go_github.com_rogpeppe_godef:recipe}
-    ${go_github.com_sirupsen_logrus:recipe}
-    ${go_github.com_skratchdot_open-golang:recipe}
-    ${go_github.com_slimsag_godocmd:recipe}
-    ${go_github.com_sourcegraph_ctxvfs:recipe}
-    ${go_github.com_sourcegraph_go-langserver:recipe}
-    ${go_github.com_sourcegraph_go-lsp:recipe}
-    ${go_github.com_sourcegraph_jsonrpc2:recipe}
-    ${go_github.com_spf13_cobra:recipe}
-    ${go_github.com_spf13_pflag:recipe}
-    ${go_github.com_sqs_goreturns:recipe}
-    ${go_github.com_tylerb_gotype-live:recipe}
-    ${go_github.com_uudashr_gopkgs:recipe}
-    ${go_github.com_zmb3_gogetdoc:recipe}
-    ${go_golang.org_x_arch:recipe}
-    ${go_golang.org_x_crypto:recipe}
-    ${go_golang.org_x_lint:recipe}
-    ${go_golang.org_x_net:recipe}
-    ${go_golang.org_x_sys:recipe}
-    ${go_golang.org_x_tools:recipe}
-    ${go_gopkg.in_alecthomas_kingpin.v3-unstable:recipe}
-    ${go_gopkg.in_yaml.v2:recipe}
-    ${go_honnef.co_go_tools:recipe}
-    ${go_sourcegraph.com_sqs_goreturns:recipe}
-
-
-[go_github.com_9fans_go]
-<= go-git-package
-go.importpath = github.com/9fans/go
-repository    = https://github.com/9fans/go
-revision      = 5d4fa602e1
-
-[go_github.com_acroca_go-symbols]
-<= go-git-package
-go.importpath = github.com/acroca/go-symbols
-repository    = https://github.com/acroca/go-symbols
-revision      = 953befd75e
-
-[go_github.com_alecthomas_gometalinter]
-<= go-git-package
-go.importpath = github.com/alecthomas/gometalinter
-repository    = https://github.com/alecthomas/gometalinter
-revision      = 8edca99e8a
-
-[go_github.com_alecthomas_units]
-<= go-git-package
-go.importpath = github.com/alecthomas/units
-repository    = https://github.com/alecthomas/units
-revision      = 2efee857e7
-
-[go_github.com_beorn7_perks]
-<= go-git-package
-go.importpath = github.com/beorn7/perks
-repository    = https://github.com/beorn7/perks
-revision      = 3a771d9929
-
-[go_github.com_cosiner_argv]
-<= go-git-package
-go.importpath = github.com/cosiner/argv
-repository    = https://github.com/cosiner/argv
-revision      = 13bacc38a0
-
-[go_github.com_cweill_gotests]
-<= go-git-package
-go.importpath = github.com/cweill/gotests
-repository    = https://github.com/cweill/gotests
-revision      = c51312f508
-
-[go_github.com_davidrjenni_reftools]
-<= go-git-package
-go.importpath = github.com/davidrjenni/reftools
-repository    = https://github.com/davidrjenni/reftools
-revision      = 654d0ba4f9
-
-[go_github.com_derekparker_delve]
-<= go-git-package
-go.importpath = github.com/derekparker/delve
-repository    = https://github.com/derekparker/delve
-revision      = ea3428550d
-
-[go_github.com_fatih_camelcase]
-<= go-git-package
-go.importpath = github.com/fatih/camelcase
-repository    = https://github.com/fatih/camelcase
-revision      = 9db1b65eb3
-
-[go_github.com_fatih_gomodifytags]
-<= go-git-package
-go.importpath = github.com/fatih/gomodifytags
-repository    = https://github.com/fatih/gomodifytags
-revision      = 141225bf62
-
-[go_github.com_fatih_structtag]
-<= go-git-package
-go.importpath = github.com/fatih/structtag
-repository    = https://github.com/fatih/structtag
-revision      = 76ae1d6d21
-
-[go_github.com_flynn_go-shlex]
-<= go-git-package
-go.importpath = github.com/flynn/go-shlex
-repository    = https://github.com/flynn/go-shlex
-revision      = 3f9db97f85
-
-[go_github.com_gogo_protobuf]
-<= go-git-package
-go.importpath = github.com/gogo/protobuf
-repository    = https://github.com/gogo/protobuf
-revision      = 6f222ca738
-
-[go_github.com_golang_lint]
-<= go-git-package
-go.importpath = github.com/golang/lint
-repository    = https://github.com/golang/lint
-revision      = 1baf3a9d7d
-
-[go_github.com_golang_protobuf]
-<= go-git-package
-go.importpath = github.com/golang/protobuf
-repository    = https://github.com/golang/protobuf
-revision      = 5e0eda4b6d
-
-[go_github.com_google_shlex]
-<= go-git-package
-go.importpath = github.com/google/shlex
-repository    = https://github.com/google/shlex
-revision      = 6f45313302
-
-[go_github.com_google_uuid]
-<= go-git-package
-go.importpath = github.com/google/uuid
-repository    = https://github.com/google/uuid
-revision      = 9b3b1e0f5f
-
-[go_github.com_hashicorp_golang-lru]
-<= go-git-package
-go.importpath = github.com/hashicorp/golang-lru
-repository    = https://github.com/hashicorp/golang-lru
-revision      = 20f1fb78b0
-
-[go_github.com_haya14busa_goplay]
-<= go-git-package
-go.importpath = github.com/haya14busa/goplay
-repository    = https://github.com/haya14busa/goplay
-revision      = v1.0.0-0-gf2d63a841a
-
-[go_github.com_josharian_impl]
-<= go-git-package
-go.importpath = github.com/josharian/impl
-repository    = https://github.com/josharian/impl
-revision      = 3d0f908298
-
-[go_github.com_karrick_godirwalk]
-<= go-git-package
-go.importpath = github.com/karrick/godirwalk
-repository    = https://github.com/karrick/godirwalk
-revision      = v1.7.5-0-g2de2192f9e
-
-[go_github.com_kisielk_gotool]
-<= go-git-package
-go.importpath = github.com/kisielk/gotool
-repository    = https://github.com/kisielk/gotool
-revision      = 80517062f5
-
-[go_github.com_mattn_go-isatty]
-<= go-git-package
-go.importpath = github.com/mattn/go-isatty
-repository    = https://github.com/mattn/go-isatty
-revision      = 3fb116b820
-
-[go_github.com_mattn_go-runewidth]
-<= go-git-package
-go.importpath = github.com/mattn/go-runewidth
-repository    = https://github.com/mattn/go-runewidth
-revision      = b20a3daf6a
-
-[go_github.com_matttproud_golang_protobuf_extensions]
-<= go-git-package
-go.importpath = github.com/matttproud/golang_protobuf_extensions
-repository    = https://github.com/matttproud/golang_protobuf_extensions
-revision      = v1.0.0-2-gc12348ce28
-
-[go_github.com_mholt_caddy]
-<= go-git-package
-go.importpath = github.com/mholt/caddy
-repository    = https://lab.nexedi.com/nexedi/caddy.git
-revision      = v0.11.0-3-g12438f6cff
-
-[go_github.com_neelance_parallel]
-<= go-git-package
-go.importpath = github.com/neelance/parallel
-repository    = https://github.com/neelance/parallel
-revision      = 4de9ce63d1
-
-[go_github.com_nicksnyder_go-i18n]
-<= go-git-package
-go.importpath = github.com/nicksnyder/go-i18n
-repository    = https://github.com/nicksnyder/go-i18n
-revision      = fc57a7d765
-
-[go_github.com_nsf_gocode]
-<= go-git-package
-go.importpath = github.com/nsf/gocode
-repository    = https://github.com/nsf/gocode
-revision      = 7b1d4e18cd
-
-[go_github.com_opentracing_basictracer-go]
-<= go-git-package
-go.importpath = github.com/opentracing/basictracer-go
-repository    = https://github.com/opentracing/basictracer-go
-revision      = 98b91394c2
-
-[go_github.com_opentracing_opentracing-go]
-<= go-git-package
-go.importpath = github.com/opentracing/opentracing-go
-repository    = https://github.com/opentracing/opentracing-go
-revision      = be550b025b
-
-[go_github.com_pelletier_go-toml]
-<= go-git-package
-go.importpath = github.com/pelletier/go-toml
-repository    = https://github.com/pelletier/go-toml
-revision      = v0.2.0-212-g81a861c69d
-
-[go_github.com_peterh_liner]
-<= go-git-package
-go.importpath = github.com/peterh/liner
-repository    = https://github.com/peterh/liner
-revision      = v1.1.0-0-g5a0dfa99e2
-
-[go_github.com_pkg_errors]
-<= go-git-package
-go.importpath = github.com/pkg/errors
-repository    = https://github.com/pkg/errors
-revision      = v0.8.0-17-g059132a15d
-
-[go_github.com_pmezard_go-difflib]
-<= go-git-package
-go.importpath = github.com/pmezard/go-difflib
-repository    = https://github.com/pmezard/go-difflib
-revision      = v1.0.0-0-g792786c740
-
-[go_github.com_prometheus_client_golang]
-<= go-git-package
-go.importpath = github.com/prometheus/client_golang
-repository    = https://github.com/prometheus/client_golang
-revision      = v0.9.0-6-g16f375c74d
-
-[go_github.com_prometheus_client_model]
-<= go-git-package
-go.importpath = github.com/prometheus/client_model
-repository    = https://github.com/prometheus/client_model
-revision      = model-0.0.2-18-g5c3871d899
-
-[go_github.com_prometheus_common]
-<= go-git-package
-go.importpath = github.com/prometheus/common
-repository    = https://github.com/prometheus/common
-revision      = 7e9e6cabbd
-
-[go_github.com_prometheus_procfs]
-<= go-git-package
-go.importpath = github.com/prometheus/procfs
-repository    = https://github.com/prometheus/procfs
-revision      = 185b428841
-
-[go_github.com_ramya-rao-a_go-outline]
-<= go-git-package
-go.importpath = github.com/ramya-rao-a/go-outline
-repository    = https://github.com/ramya-rao-a/go-outline
-revision      = 9e9d089bb6
-
-[go_github.com_rogpeppe_godef]
-<= go-git-package
-go.importpath = github.com/rogpeppe/godef
-repository    = https://github.com/rogpeppe/godef
-revision      = v1.0.0-0-g7b4626be9f
-
-[go_github.com_sirupsen_logrus]
-<= go-git-package
-go.importpath = github.com/sirupsen/logrus
-repository    = https://github.com/sirupsen/logrus
-revision      = 4fabf2fffc
-
-[go_github.com_skratchdot_open-golang]
-<= go-git-package
-go.importpath = github.com/skratchdot/open-golang
-repository    = https://github.com/skratchdot/open-golang
-revision      = 75fb7ed420
-
-[go_github.com_slimsag_godocmd]
-<= go-git-package
-go.importpath = github.com/slimsag/godocmd
-repository    = https://github.com/slimsag/godocmd
-revision      = a1005ad29f
-
-[go_github.com_sourcegraph_ctxvfs]
-<= go-git-package
-go.importpath = github.com/sourcegraph/ctxvfs
-repository    = https://github.com/sourcegraph/ctxvfs
-revision      = 2b65f1b1ea
-
-[go_github.com_sourcegraph_go-langserver]
-<= go-git-package
-go.importpath = github.com/sourcegraph/go-langserver
-repository    = https://github.com/sourcegraph/go-langserver
-revision      = 2b83206020
-
-[go_github.com_sourcegraph_go-lsp]
-<= go-git-package
-go.importpath = github.com/sourcegraph/go-lsp
-repository    = https://github.com/sourcegraph/go-lsp
-revision      = 4631ffd93a
-
-[go_github.com_sourcegraph_jsonrpc2]
-<= go-git-package
-go.importpath = github.com/sourcegraph/jsonrpc2
-repository    = https://github.com/sourcegraph/jsonrpc2
-revision      = 549eb959f0
-
-[go_github.com_spf13_cobra]
-<= go-git-package
-go.importpath = github.com/spf13/cobra
-repository    = https://github.com/spf13/cobra
-revision      = fe5e611709
-
-[go_github.com_spf13_pflag]
-<= go-git-package
-go.importpath = github.com/spf13/pflag
-repository    = https://github.com/spf13/pflag
-revision      = 082b515c94
-
-[go_github.com_sqs_goreturns]
-<= go-git-package
-go.importpath = github.com/sqs/goreturns
-repository    = https://github.com/sqs/goreturns
-revision      = 83e02874ec
-
-[go_github.com_tylerb_gotype-live]
-<= go-git-package
-go.importpath = github.com/tylerb/gotype-live
-repository    = https://github.com/tylerb/gotype-live
-revision      = 440f9c77a4
-
-[go_github.com_uudashr_gopkgs]
-<= go-git-package
-go.importpath = github.com/uudashr/gopkgs
-repository    = https://github.com/uudashr/gopkgs
-revision      = 84fe2e5def
-
-[go_github.com_zmb3_gogetdoc]
-<= go-git-package
-go.importpath = github.com/zmb3/gogetdoc
-repository    = https://github.com/zmb3/gogetdoc
-revision      = 0d07153ccc
-
-[go_golang.org_x_arch]
-<= go-git-package
-go.importpath = golang.org/x/arch
-repository    = https://go.googlesource.com/arch
-revision      = b19384d3c1
-
-[go_golang.org_x_crypto]
-<= go-git-package
-go.importpath = golang.org/x/crypto
-repository    = https://go.googlesource.com/crypto
-revision      = 85e1b3f913
-
-[go_golang.org_x_lint]
-<= go-git-package
-go.importpath = golang.org/x/lint
-repository    = https://go.googlesource.com/lint
-revision      = 1baf3a9d7d
-
-[go_golang.org_x_net]
-<= go-git-package
-go.importpath = golang.org/x/net
-repository    = https://go.googlesource.com/net
-revision      = 9b4f9f5ad5
-
-[go_golang.org_x_sys]
-<= go-git-package
-go.importpath = golang.org/x/sys
-repository    = https://go.googlesource.com/sys
-revision      = d989b31c87
-
-[go_golang.org_x_tools]
-<= go-git-package
-go.importpath = golang.org/x/tools
-repository    = https://go.googlesource.com/tools
-revision      = a2dc47679d
-
-[go_gopkg.in_alecthomas_kingpin.v3-unstable]
-<= go-git-package
-go.importpath = gopkg.in/alecthomas/kingpin.v3-unstable
-repository    = https://gopkg.in/alecthomas/kingpin.v3-unstable
-revision      = df19058c87
-
-[go_gopkg.in_yaml.v2]
-<= go-git-package
-go.importpath = gopkg.in/yaml.v2
-repository    = https://gopkg.in/yaml.v2
-revision      = v2.1.1-17-g5420a8b674
-
-[go_honnef.co_go_tools]
-<= go-git-package
-go.importpath = honnef.co/go/tools
-repository    = https://github.com/dominikh/go-tools
-revision      = e3ad64cb4e
-
-[go_sourcegraph.com_sqs_goreturns]
-<= go-git-package
-go.importpath = sourcegraph.com/sqs/goreturns
-repository    = https://github.com/sqs/goreturns
-revision      = 83e02874ec

software/theia/instance.cfg.in

@@ -121,7 +121,7 @@ recipe = slapos.cookbook:userinfo
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
 command-line =
-  env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}' THEIA_SHELL=$${theia-shell:wrapper-path} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project}
+  env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}' THEIA_SHELL=$${theia-shell:rendered} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project}
 
 ip =  $${instance-parameter:ipv4-random}
 hostname =  $${:ip}
@@ -132,12 +132,18 @@ hash-existing-files =
   ${theia-wrapper:rendered}
 
 [theia-shell]
-recipe = slapos.cookbook:wrapper
-wrapper-path = $${directory:bin}/$${:_buildout_section_name_}
-# reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
-# activate slapos configuration
-command-line =
-  ${bash:location}/bin/bash -c ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash"
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:bin}/$${:_buildout_section_name_}
+mode = 0700
+template = inline:
+  #!${python:location}/bin/python
+  import sys
+  import os
+  args = sys.argv[1:]
+  # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
+  if not args: args = ["-c", ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash", ]
+  os.execv('${bash:location}/bin/bash', ['${bash:location}/bin/bash']  + args)
+
 
 [slapos-standalone-activate]
 recipe = slapos.recipe.template:jinja2
@@ -147,7 +153,16 @@ mode = 0700
 template =
   inline:#!/bin/sh
   export PATH=${buildout:bin-directory}:$PATH
-  ${slapos-standalone:script-path} $${directory:slapos} $${:ipv4} $${:ipv6} $${:port}
+  ${slapos-standalone:script-path} \
+      $${directory:slapos} \
+      $${:ipv4} \
+      $${:ipv6} \
+      $${:port} \
+      $${slap-connection:server-url} \
+      $${slap-connection:computer-id} \
+      $${slap-connection:partition-id} \
+      --key='$${slap-connection:key-file}' \
+      --cert='$${slap-connection:cert-file}'
   export SLAPOS_CONFIGURATION=$${directory:slapos}/etc/slapos.cfg
   export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
 

software/theia/software.cfg

@@ -10,15 +10,11 @@ extends =
    ../../component/vim/buildout.cfg
    ../../component/curl/buildout.cfg
    ../../component/coreutils/buildout.cfg
+   ../../component/java-jdk/buildout.cfg
    ../../stack/slapos.cfg
    ../../stack/monitor/buildout.cfg
-   ./gowork.cfg
+   ../../component/defaults.cfg
    ./buildout.hash.cfg
-# this gowork.cfg includes the one from caddy, because they share the only gowork
-# workspace (not intentionnaly, as far as I see there's only one gowork per SR)
-# it is included after caddy, otherwise only caddy is installed. The problem of this
-# approach is that caddy's version will be the one pinned here, so we have to update
-# here as well.
 
 parts =
   theia-wrapper
@@ -28,6 +24,11 @@ parts =
 # default for slapos-standalone
 shared-part-list =
 
+# We keep the gcc part in sync with the one from erp5 software, so that when we install
+# erp5 inside theia's slapos parts can be shared.
+[gcc]
+max_version = 0
+
 
 [nodejs]
 <= nodejs-10.19.0
@@ -64,14 +65,33 @@ initialization =
   parser.add_argument('ipv4')
   parser.add_argument('ipv6')
   parser.add_argument('server_port', type=int)
+  forwarded_arguments = parser.add_argument_group('forwarded')
+  forwarded_arguments.add_argument('master_url')
+  forwarded_arguments.add_argument('computer')
+  forwarded_arguments.add_argument('partition')
+  # cert and key are optional
+  forwarded_arguments.add_argument('--cert')
+  forwarded_arguments.add_argument('--key')
   args = parser.parse_args()
   shared_part_list = [x.strip() for x in '''${buildout:shared-part-list}'''.splitlines() if x.strip()]
-
+  partition_forward_configuration = (
+      slapos.slap.standalone.PartitionForwardAsPartitionConfiguration(
+          master_url=args.master_url,
+          computer=args.computer,
+          partition=args.partition,
+          cert=args.cert,
+          key=args.key,
+          software_release_list=(
+            'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg',
+          ),
+      ),
+  )
   standalone = slapos.slap.standalone.StandaloneSlapOS(
       args.base_directory,
       args.ipv4,
       args.server_port,
-      shared_part_list=shared_part_list
+      shared_part_list=shared_part_list,
+      partition_forward_configuration=partition_forward_configuration,
   )
   standalone.start()
   partition_count = 20
@@ -139,7 +159,8 @@ mode = 0644
 
 [package.json]
 recipe = slapos.recipe.template:jinja2
-# this comes from https://github.com/theia-ide/theia-apps/blob/2991e3a433f031b22bc80e274f80620d1e6898e5/theia-full-docker/latest.package.json
+# this comes from https://github.com/theia-ide/theia-apps/blob/3391dd07cba7ddc5cc833420349a27beb66a5433/theia-full-docker/latest.package.json
+# but with a more recent version of vscode-java-redhat, where https://github.com/redhat-developer/vscode-java/issues/1301 was fixed
 template =
   inline:{
       "private": true,
@@ -163,17 +184,20 @@ template =
                         "**/node_modules/**": true
                       },
                       "editor.multiCursorModifier": "ctrlCmd",
-                      "plantuml.webservice": "//plantuml.host.vifib.net/svg/",
+                      "editor.tabSize": 2,
                       "plantuml.monochrome": false,
-                      "editor.tabSize": 2
+                      "plantuml.webservice": "//plantuml.host.vifib.net/svg/",
+                      "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }],
+                      "java.home": "${java-jdk:location}"
                   }
               }
           }
       },
       "dependencies": {
           "@theia/callhierarchy": "latest",
+          "@theia/console": "latest",
           "@theia/core": "latest",
-          "@theia/cpp": "latest",
+          "@theia/cpp-debug": "latest",
           "@theia/debug": "latest",
           "@theia/editor": "latest",
           "@theia/editor-preview": "latest",
@@ -200,9 +224,11 @@ template =
           "@theia/preview": "latest",
           "@theia/process": "latest",
           "@theia/rust": "latest",
+          "@theia/scm": "latest",
           "@theia/search-in-workspace": "latest",
           "@theia/task": "latest",
           "@theia/terminal": "latest",
+          "@theia/typehierarchy": "latest",
           "@theia/userstorage": "latest",
           "@theia/variable-resolver": "latest",
           "@theia/vsx-registry": "latest",
@@ -211,8 +237,9 @@ template =
       "resolutions": {
           "vscode-json-languageserver": "1.2.2",
           "vscode-languageserver-protocol": "3.15.0-next.9",
-          "vscode-languageserver-types": "3.15.0-next.4",
-          "**/vscode-json-languageserver/**/vscode-languageserver": "6.0.0-next.1"
+          "vscode-languageserver-types": "3.15.0-next.5",
+          "**/vscode-json-languageserver/**/vscode-languageserver": "6.0.0-next.1",
+          "**/moment": "2.24.0"
       },
       "devDependencies": {
           "@theia/cli": "latest"
@@ -285,7 +312,7 @@ template =
           "vscode-go": "https://github.com/microsoft/vscode-go/releases/download/0.12.0/Go-0.12.0.vsix",
           "vscode-java-debug": "https://github.com/microsoft/vscode-java-debug/releases/download/0.24.0/vscjava.vscode-java-debug-0.24.0.vsix",
           "vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix",
-          "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.54.2/redhat.java-0.54.2.vsix",
+          "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.61.0/redhat.java-0.61.0.vsix",
           "vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix",
           "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
           "vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix",
@@ -297,29 +324,15 @@ mode = 0644
 
 
 [gowork]
-# Install go-language-server in workspace
-# Note that this is the same workspace as caddy.
-# install list comes from https://github.com/theia-ide/go-language-server/blob/d259749c8f263c4d845055833b03b1d2dbefa5b3/README.md#prerequisites
-install +=
-  github.com/ramya-rao-a/go-outline
-  github.com/acroca/go-symbols
-  github.com/nsf/gocode
-  github.com/rogpeppe/godef
-  golang.org/x/tools/cmd/godoc
-  github.com/zmb3/gogetdoc
-  golang.org/x/lint/golint
-  github.com/fatih/gomodifytags
-  github.com/uudashr/gopkgs/cmd/gopkgs
-  golang.org/x/tools/cmd/gorename
-  sourcegraph.com/sqs/goreturns
-  github.com/cweill/gotests/...
-  golang.org/x/tools/cmd/guru
-  github.com/josharian/impl
-  github.com/haya14busa/goplay/cmd/goplay
-  github.com/davidrjenni/reftools/cmd/fillstruct
+golang = ${golang1.14:location}
+
+[gowork.goinstall]
+command =
+  bash -c ". ${gowork:env.sh} && GO111MODULE=on go get golang.org/x/tools/gopls@v0.4.3"
+
 
 [cli-utilities]
-PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin
+PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin:${python2.7:location}/bin/
 
 [theia-wrapper]
 recipe = slapos.recipe.template:jinja2
@@ -329,7 +342,7 @@ template =
   inline:
   #!/bin/bash
   . ${gowork:env.sh}
-  export PATH=${python-language-server:location}/bin/:${cli-utilities:PATH}:$PATH
+  export PATH=${python-language-server:location}/bin/:${java-jdk:location}/bin/:${cli-utilities:PATH}:$PATH
   export THEIA_DEFAULT_PLUGINS="local-dir:${theia:THEIA_DEFAULT_PLUGINS}"
   # reset PS1 from gowork
   export PS1='$ '

software/theia/test/test.py

@@ -29,6 +29,7 @@ from __future__ import unicode_literals
 import os
 import textwrap
 import logging
+import subprocess
 import tempfile
 import time
 from six.moves.urllib.parse import urlparse, urljoin
@@ -89,6 +90,15 @@ class TestTheia(SlapOSInstanceTestCase):
     # use a large enough terminal so that slapos proxy show table fit in the screen
     process.setwinsize(5000, 5000)
 
+    # log process output for debugging
+    logger = logging.getLogger('theia-shell')
+    class DebugLogFile:
+      def write(self, msg):
+        logger.info("output from theia-shell: %s", msg)
+      def flush(self):
+        pass
+    process.logfile = DebugLogFile()
+
     process.expect_exact('Standalone SlapOS: Formatting 20 partitions')
     process.expect_exact('Standalone SlapOS for computer `local` activated')
 
@@ -122,3 +132,13 @@ class TestTheia(SlapOSInstanceTestCase):
 
     process.terminate()
     process.wait()
+
+  def test_theia_shell_execute_tasks(self):
+    # shell needs to understand -c "comamnd" arguments for theia tasks feature
+    test_file = '{}/test file'.format(self.computer_partition_root_path)
+    subprocess.check_call([
+        '{}/bin/theia-shell'.format(self.computer_partition_root_path),
+        '-c',
+        'touch "{}"'.format(test_file)
+    ])
+    self.assertTrue(os.path.exists(test_file))

stack/erp5/buildout.cfg

@@ -14,6 +14,7 @@ extends =
   ../../component/findutils/buildout.cfg
   ../../component/librsvg/buildout.cfg
   ../../component/imagemagick/buildout.cfg
+  ../../component/jpegoptim/buildout.cfg
   ../../component/kumo/buildout.cfg
   ../../component/libdmtx/buildout.cfg
   ../../component/matplotlib/buildout.cfg
@@ -21,6 +22,7 @@ extends =
   ../../component/statsmodels/buildout.cfg
   ../../component/h5py/buildout.cfg
   ../../component/ocropy/buildout.cfg
+  ../../component/optipng/buildout.cfg
   ../../component/pandas/buildout.cfg
   ../../component/percona-toolkit/buildout.cfg
   ../../component/patch/buildout.cfg
@@ -240,11 +242,13 @@ link-binary =
   ${grep:location}/bin/grep
   ${imagemagick:location}/bin/convert
   ${imagemagick:location}/bin/identify
+  ${jpegoptim:location}/bin/jpegoptim
   ${jsl:location}/bin/jsl
   ${librsvg:location}/bin/rsvg-convert
   ${mariadb:location}/bin/mysql
   ${mariadb:location}/bin/mysqldump
   ${openssl:location}/bin/openssl
+  ${optipng:location}/bin/optipng
   ${poppler:location}/bin/pdfinfo
   ${poppler:location}/bin/pdftohtml
   ${poppler:location}/bin/pdftotext

stack/slapos.cfg

@@ -160,7 +160,7 @@ pytz = 2016.10
 requests = 2.24.0
 six = 1.12.0
 slapos.cookbook = 1.0.152
-slapos.core = 1.5.12
+slapos.core = 1.6.0
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20