Update Release Candidate

component/openssh/buildout.cfg

@@ -15,12 +15,12 @@ parts =
 
 [openssh]
 recipe = slapos.recipe.cmmi
-md5sum = b2db2a83caf66a208bb78d6d287cdaa3
-url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.4p1.tar.gz
+md5sum = 68ba883aff6958297432e5877e9a0fe2
+url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.7p1.tar.gz
 patch-binary = ${patch:location}/bin/patch
-#patch-options = -p1
+patch-options = -p1
 patches =
-  ${:_profile_base_location_}/no_create_privsep_path.patch#d5b61a2442fffa457cebe4ad1dc68f4e
+  ${:_profile_base_location_}/no_create_privsep_path.patch#f341dc11d73df6f43c7ae1fa47b8c003
 environment = 
   CPPFLAGS=-I${zlib:location}/include -I${openssl-1.0:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib

component/openssh/no_create_privsep_path.patch

---- Makefile.in	2016-07-28 00:54:27.000000000 +0200
-+++ Makefile.in	2016-08-19 13:02:30.227177750 +0200
-@@ -304,7 +304,6 @@
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
--	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
+From 46cf5eba19cf52ffae48ea95f07a36b4c107ebd8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Sun, 20 May 2018 20:47:16 +0900
+Subject: [PATCH] Do not create PRIVSEP_PATH
+
+For SlapOS, this would need to be in instance, but instance paths are
+not known at software compilation time.  Because we don't do privileges
+separation, just disable creation of this directory.
+---
+ Makefile.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 04e1c8e5..9bd5d01b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -329,7 +329,6 @@ install-files:
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+ 	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+-	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
+-- 
+2.11.0
+

component/protobuf/buildout.cfg

@@ -5,13 +5,8 @@ parts = protobuf
 recipe = slapos.recipe.cmmi
 url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-python-3.4.0.tar.gz
 md5sum = 0820cc2e56d71aef8e99794fcbd184cd
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [protobuf-cpp]
 recipe = slapos.recipe.cmmi
 url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
 md5sum = 6d59dad503bea5ad420fd09ddad84481
-configure-command =
-  ./autogen.sh
-  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-

component/python3/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../gettext/buildout.cfg
   ../libexpat/buildout.cfg
   ../libffi/buildout.cfg
+  ../libpng/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg

component/qemu-kvm/buildout.cfg

@@ -38,6 +38,7 @@ configure-options =
   --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include"
   --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib"
   --disable-werror
+  --disable-xfsctl
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig

component/randomsleep/buildout.cfg

@@ -12,10 +12,10 @@ bash_script_code =
     echo "usage: randomsleep maxseconds"
     exit
   fi
-  ${coreutils:location}/bin/sleep $((RANDOM % $1)).$((RANDOM % 100))
+  exec ${coreutils:location}/bin/sleep $((RANDOM * $1 >> 15)).$((RANDOM * 100 >> 15))
 wrapper_script_code =
   #!${bash:location}/bin/bash
-  ${bash:location}/bin/bash ${:location}/randomsleep.bash "$@"
+  . ${:location}/randomsleep.bash
 script =
   os.makedirs(self.options['location'])
 

component/tomcat/buildout.cfg

@@ -20,8 +20,8 @@ md5sum = 3dde098fd0b3a08d3f2867e4a95591ba
 recipe = hexagonit.recipe.download
 ignore-existing = true
 strip-top-level-dir = true
-url = http://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.91/bin/apache-tomcat-7.0.91.tar.gz
-md5sum = 8bfbb358b51f90374067879f8db1e91c
+url = http://www-us.apache.org/dist/tomcat/tomcat-7/v7.0.96/bin/apache-tomcat-7.0.96.tar.gz
+md5sum = 0669aa2996b67c61662a5a4f993767b8
 
 [tomcat9]
 recipe = hexagonit.recipe.download

component/vm-img/debian.cfg

@@ -22,7 +22,7 @@ dist = ${vm-debian:dists}
 [vm-debian]
 recipe = slapos.recipe.build:vm.install-debian
 environment = vm-install-environment
-dists = debian-stretch
+dists = debian-stable
 size = 1Gi
 late-command =
 # rdnssd causes too much trouble with recent QEMU, because the latter acts as
@@ -60,23 +60,33 @@ preseed.apt-setup/enable-source-repositories = false
 preseed.recommends = false
 preseed.tasks =
 
+[debian-stable]
+x86_64.iso = debian-amd64-netinst.iso
+x86_64.kernel = install.amd/vmlinuz
+x86_64.initrd = install.amd/initrd.gz
+
+[debian-testing]
+<= debian-stable
+x86_64.iso = debian-amd64-testing-netinst.iso
+
 [debian-squeeze]
-<= debian-stretch
+<= debian-stable
 x86_64.iso = debian-amd64-squeeze-netinst.iso
 
 [debian-wheezy]
-<= debian-stretch
+<= debian-stable
 x86_64.iso = debian-amd64-wheezy-netinst.iso
 
 [debian-jessie]
-<= debian-stretch
+<= debian-stable
 x86_64.iso = debian-amd64-jessie-netinst.iso
 
 [debian-stretch]
-x86_64.iso = debian-amd64-netinst.iso
-x86_64.kernel = install.amd/vmlinuz
-x86_64.initrd = install.amd/initrd.gz
+<= debian-stable
+x86_64.iso = debian-amd64-stretch-netinst.iso
 
 [debian-buster]
-<= debian-stretch
-x86_64.iso = debian-amd64-testing-netinst.iso
+<= debian-stable
+
+[debian-bullseye]
+<= debian-testing

software/caddy-frontend/buildout.hash.cfg

@@ -54,7 +54,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = 9a984febd7fa14a4ea94599f3e83139c
+md5sum = b5447e33658b8a81b75275630f9da119
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
@@ -74,7 +74,7 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 
 [template-trafficserver-records-config]
 filename = templates/trafficserver/records.config.jinja2
-md5sum = 3c342b0388f94f819b04b05b46744427
+md5sum = 3a4e378932ffc7768426bb7a897e2c45
 
 [template-trafficserver-storage-config]
 filename = templates/trafficserver/storage.config.jinja2

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

@@ -73,7 +73,7 @@
   }
 
 {%- if not (slave_type == 'zope' and backend_url) %}
-{%    if prefer_gzip %}
+{%    if prefer_gzip and not (not tls and https_only) %}
   rewrite {
     regexp (.*)
     if {>Accept-Encoding} match "(^gzip,.*|.*, gzip,.*|.*, gzip$|^gzip$)"
@@ -138,7 +138,7 @@
     / {scheme}://{host}/{{ default_path }}
   } {# redir #}
   {%- endif %} {#- if default_path #}
-{%- if prefer_gzip  %}
+{%- if prefer_gzip and not (not tls and https_only) %}
   rewrite {
     regexp (.*)
     if {>Accept-Encoding} match "(^gzip,.*|.*, gzip,.*|.*, gzip$|^gzip$)"

software/caddy-frontend/templates/trafficserver/records.config.jinja2

@@ -25,6 +25,8 @@ CONFIG proxy.config.log.logfile_dir STRING {{ ats_directory['log'] }}
 # Implement RFC 5861 with core
 CONFIG proxy.config.http.cache.open_write_fail_action INT 2
 CONFIG proxy.config.body_factory.template_sets_dir STRING  {{ ats_configuration['templates-dir'] }}
+# Support stale-if-error by returning cached content on backend 5xx or unavailability
+CONFIG proxy.config.http.negative_revalidating_enabled INT 1
 
 ##############################################################################
 # Thread configurations. Docs:

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: OK
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: ERROR
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,7 +4,11 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,7 +4,11 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,7 +4,11 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,7 +4,11 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: ERROR
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: ERROR
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
-T-3/etc/plugin/buildout-T-3-status.py: OK
-T-3/etc/plugin/caddy_cached.py: OK
-T-3/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-3/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-3/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-3/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-3/etc/plugin/caddy_ssl_cached.py: OK
-T-3/etc/plugin/check-free-disk-space.py: OK
-T-3/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-3/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-3/etc/plugin/monitor-bootstrap-status.py: OK
-T-3/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-3/etc/plugin/re6st-connectivity.py: OK
-T-3/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -2,6 +2,7 @@ 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/kedfia.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
@@ -69,6 +70,8 @@ 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/_re6st-optimal-test_access_log
@@ -109,6 +112,8 @@ 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

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

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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: ERROR
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -12,7 +12,7 @@ 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-{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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: ERROR
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-_monitor-ipv4-test-unsafe-ipv4-packet-list-test.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-unsafe-ipv6-packet-list-test.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-unsafe-re6st-optimal-test.py: OK
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_ciphers_access_log
 T-2/var/log/httpd/_default_ciphers_error_log

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK
\ No newline at end of file

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: ERROR
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: OK
-T-2/etc/plugin/check-_monitor-ipv4-test-ipv4-packet-list-test.py: OK
-T-2/etc/plugin/check-_monitor-ipv6-test-ipv6-packet-list-test.py: OK
-T-2/etc/plugin/check-_re6st-optimal-test-re6st-optimal-test.py: OK
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: ERROR
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

@@ -4,6 +4,8 @@ T-1/var/log/expose-csr_id.log
 T-1/var/log/kedfia.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

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

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

-T-0/etc/plugin/buildout-T-0-status.py: OK
-T-0/etc/plugin/check-free-disk-space.py: OK
-T-0/etc/plugin/monitor-bootstrap-status.py: OK
-T-0/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-0/etc/plugin/rejected-slave-publish-ip-port-listening.py: OK
-T-0/etc/plugin/rejected-slave.py: OK
-T-1/etc/plugin/buildout-T-1-status.py: OK
-T-1/etc/plugin/check-free-disk-space.py: OK
-T-1/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-1/etc/plugin/kedifa-http-reply.py: OK
-T-1/etc/plugin/monitor-bootstrap-status.py: OK
-T-1/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/buildout-T-2-status.py: OK
-T-2/etc/plugin/caddy_cached.py: ERROR
-T-2/etc/plugin/caddy_frontend_ipv4_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv4_https.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_http.py: OK
-T-2/etc/plugin/caddy_frontend_ipv6_https.py: OK
-T-2/etc/plugin/caddy_ssl_cached.py: ERROR
-T-2/etc/plugin/check-free-disk-space.py: OK
-T-2/etc/plugin/expose-csr_id-ip-port-listening.py: OK
-T-2/etc/plugin/frontend-caddy-configuration-promise.py: OK
-T-2/etc/plugin/monitor-bootstrap-status.py: OK
-T-2/etc/plugin/monitor-httpd-listening-on-tcp.py: OK
-T-2/etc/plugin/re6st-connectivity.py: OK
-T-2/etc/plugin/trafficserver-port-listening.py: OK
\ No newline at end of file

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

-T-1/etc/promise/caucased: OK

software/caddy-frontend/test/utils.py

-##############################################################################
-#
-# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import unittest
-import os
-import socket
-from contextlib import closing
-import logging
-import StringIO
-import xmlrpclib
-
-import supervisor.xmlrpc
-from erp5.util.testnode.SlapOSControler import SlapOSControler
-from erp5.util.testnode.ProcessManager import ProcessManager
-
-
-# Utility functions
-def findFreeTCPPort(ip=''):
-  """Find a free TCP port to listen to.
-  """
-  family = socket.AF_INET6 if ':' in ip else socket.AF_INET
-  with closing(socket.socket(family, socket.SOCK_STREAM)) as s:
-    s.bind((ip, 0))
-    return s.getsockname()[1]
-
-
-# TODO:
-#  - allow requesting multiple instances ?
-
-class SlapOSInstanceTestCase(unittest.TestCase):
-  """Install one slapos instance.
-
-  This test case install software(s) and request one instance during
-  `setUpClass` and destroy the instance during `tearDownClass`.
-
-  Software Release URL, Instance Software Type and Instance Parameters can be
-  defined on the class.
-
-  All tests from the test class will run with the same instance.
-
-  The following class attributes are available:
-
-    * `computer_partition`:  the computer partition instance, implementing
-    `slapos.slap.interface.slap.IComputerPartition`.
-
-    * `computer_partition_root_path`: the path of the instance root directory.
-
-  """
-
-  # Methods to be defined by subclasses.
-  @classmethod
-  def getSoftwareURLList(cls):
-    """Return URL of software releases to install.
-
-    To be defined by subclasses.
-    """
-    raise NotImplementedError()
-
-  @classmethod
-  def getInstanceParameterDict(cls):
-    """Return instance parameters
-
-    To be defined by subclasses if they need to request instance with specific
-    parameters.
-    """
-    return {}
-
-  @classmethod
-  def getInstanceSoftwareType(cls):
-    """Return software type for instance, default "default"
-
-    To be defined by subclasses if they need to request instance with specific
-    software type.
-    """
-    return "default"
-
-  # Utility methods.
-  @classmethod
-  def getSupervisorRPCServer(cls):
-    """Returns a XML-RPC connection to the supervisor used by slapos node
-
-    Refer to http://supervisord.org/api.html for details of available methods.
-    """
-    # xmlrpc over unix socket https://stackoverflow.com/a/11746051/7294664
-    return xmlrpclib.ServerProxy(
-       'http://slapos-supervisor',
-       transport=supervisor.xmlrpc.SupervisorTransport(
-           None,
-           None,
-           # XXX hardcoded socket path
-           serverurl="unix://{working_directory}/inst/supervisord.socket".format(
-             **cls.config)))
-
-  # Unittest methods
-  @classmethod
-  def setUpClass(cls):
-    """Setup the class, build software and request an instance.
-
-    If you have to override this method, do not forget to call this method on
-    parent class.
-    """
-    try:
-      cls.setUpWorkingDirectory()
-      cls.setUpConfig()
-      cls.setUpSlapOSController()
-
-      cls.runSoftwareRelease()
-      # XXX instead of "runSoftwareRelease", it would be better to be closer to slapos usage:
-      # cls.supplySoftwares()
-      # cls.installSoftwares()
-
-      cls.runComputerPartition()
-      # XXX instead of "runComputerPartition", it would be better to be closer to slapos usage:
-      # cls.requestInstances()
-      # cls.createInstances()
-      # cls.requestInstances()
-
-    except Exception:
-      cls.stopSlapOSProcesses()
-      raise
-
-  @classmethod
-  def tearDownClass(cls):
-    """Tear down class, stop the processes and destroy instance.
-    """
-    cls.stopSlapOSProcesses()
-
-  # Implementation
-  @classmethod
-  def stopSlapOSProcesses(cls):
-    if hasattr(cls, '_process_manager'):
-      cls._process_manager.killPreviousRun()
-
-  @classmethod
-  def setUpWorkingDirectory(cls):
-    """Initialise the directories"""
-    cls.working_directory = os.environ.get(
-        'SLAPOS_TEST_WORKING_DIR',
-        os.path.join(os.path.dirname(__file__), '.slapos'))
-    # To prevent error: Cannot open an HTTP server: socket.error reported
-    # AF_UNIX path too long This `working_directory` should not be too deep.
-    # Socket path is 108 char max on linux
-    # https://github.com/torvalds/linux/blob/3848ec5/net/unix/af_unix.c#L234-L238
-    # Supervisord socket name contains the pid number, which is why we add
-    # .xxxxxxx in this check.
-    if len(cls.working_directory + '/inst/supervisord.socket.xxxxxxx') > 108:
-      raise RuntimeError('working directory ( {} ) is too deep, try setting '
-              'SLAPOS_TEST_WORKING_DIR'.format(cls.working_directory))
-
-    if not os.path.exists(cls.working_directory):
-      os.mkdir(cls.working_directory)
-
-  @classmethod
-  def setUpConfig(cls):
-    """Create slapos configuration"""
-    cls.config = {
-      "working_directory": cls.working_directory,
-      "slapos_directory": cls.working_directory,
-      "log_directory": cls.working_directory,
-      "computer_id": 'slapos.test',  # XXX
-      'proxy_database': os.path.join(cls.working_directory, 'proxy.db'),
-      'partition_reference': 'T',  # minimise path length, see https://github.com/apache/trafficserver/issues/2421
-      # "proper" slapos command must be in $PATH
-      'slapos_binary': 'slapos',
-      'node_quantity': '3',
-    }
-    # Some tests are expecting that local IP is not set to 127.0.0.1
-    ipv4_address = os.environ.get('SLAPOS_TEST_IPV4', '127.0.1.1')
-    ipv6_address = os.environ['SLAPOS_TEST_IPV6']
-
-    cls.config['proxy_host'] = cls.config['ipv4_address'] = ipv4_address
-    cls.config['ipv6_address'] = ipv6_address
-    cls.config['proxy_port'] = findFreeTCPPort(ipv4_address)
-    cls.config['master_url'] = 'http://{proxy_host}:{proxy_port}'.format(
-      **cls.config)
-
-  @classmethod
-  def setUpSlapOSController(cls):
-    """Create the a "slapos controller" and supply softwares from `getSoftwareURLList`.
-
-    This is equivalent to:
-
-    slapos proxy start
-    for sr in getSoftwareURLList; do
-      slapos supply $SR $COMP
-    done
-    """
-    cls._process_manager = ProcessManager()
-
-    # XXX this code is copied from testnode code
-    cls.slapos_controler = SlapOSControler(
-        cls.working_directory,
-        cls.config
-    )
-
-    slapproxy_log = os.path.join(cls.config['log_directory'], 'slapproxy.log')
-    logger = logging.getLogger(__name__)
-    logger.debug('Configured slapproxy log to %r', slapproxy_log)
-
-    cls.software_url_list = cls.getSoftwareURLList()
-    cls.slapos_controler.initializeSlapOSControler(
-        slapproxy_log=slapproxy_log,
-        process_manager=cls._process_manager,
-        reset_software=False,
-        software_path_list=cls.software_url_list)
-
-    # XXX we should check *earlier* if that pidfile exist and if supervisord
-    # process still running, because if developer started supervisord (or bugs?)
-    # then another supervisord will start and starting services a second time
-    # will fail.
-    cls._process_manager.supervisord_pid_file = os.path.join(
-      cls.slapos_controler.instance_root, 'var', 'run', 'supervisord.pid')
-
-  @classmethod
-  def runSoftwareRelease(cls):
-    """Run all the software releases that were supplied before.
-
-    This is the equivalent of `slapos node software`.
-
-    The tests will be marked file if software building fail.
-    """
-    logger = logging.getLogger()
-    logger.level = logging.DEBUG
-    stream = StringIO.StringIO()
-    stream_handler = logging.StreamHandler(stream)
-    logger.addHandler(stream_handler)
-
-    try:
-      cls.software_status_dict = cls.slapos_controler.runSoftwareRelease(
-        cls.config, environment=os.environ)
-      stream.seek(0)
-      stream.flush()
-      message = ''.join(stream.readlines()[-100:])
-      assert cls.software_status_dict['status_code'] == 0, message
-    finally:
-      logger.removeHandler(stream_handler)
-      del stream
-
-
-  @classmethod
-  def runComputerPartition(cls, max_quantity=None):
-    """Instanciate the software.
-
-    This is the equivalent of doing:
-
-    slapos request --type=getInstanceSoftwareType --parameters=getInstanceParameterDict
-    slapos node instance
-
-    and return the slapos request instance parameters.
-
-    This can be called by tests to simulate re-request with different parameters.
-    """
-    run_cp_kw = {}
-    if max_quantity is not None:
-      run_cp_kw['max_quantity'] = max_quantity
-    logger = logging.getLogger()
-    logger.level = logging.DEBUG
-    stream = StringIO.StringIO()
-    stream_handler = logging.StreamHandler(stream)
-    logger.addHandler(stream_handler)
-
-    if cls.getInstanceSoftwareType() != 'default':
-      raise NotImplementedError
-
-    instance_parameter_dict = cls.getInstanceParameterDict()
-    try:
-      cls.instance_status_dict = cls.slapos_controler.runComputerPartition(
-        cls.config,
-        cluster_configuration=instance_parameter_dict,
-        environment=os.environ,
-        **run_cp_kw)
-      stream.seek(0)
-      stream.flush()
-      message = ''.join(stream.readlines()[-100:])
-      assert cls.instance_status_dict['status_code'] == 0, message
-    finally:
-      logger.removeHandler(stream_handler)
-      del stream
-
-    # FIXME: similar to test node, only one (root) partition is really
-    #        supported for now.
-    computer_partition_list = []
-    for i in range(len(cls.software_url_list)):
-      computer_partition_list.append(
-          cls.slapos_controler.slap.registerOpenOrder().request(
-            cls.software_url_list[i],
-            # This is how testnode's SlapOSControler name created partitions
-            partition_reference='testing partition {i}'.format(
-              i=i, **cls.config),
-            partition_parameter_kw=instance_parameter_dict))
-
-    # expose some class attributes so that tests can use them:
-    # the ComputerPartition instances, to getInstanceParameterDict
-    cls.computer_partition = computer_partition_list[0]
-
-    # the path of the instance on the filesystem, for low level inspection
-    cls.computer_partition_root_path = os.path.join(
-        cls.config['working_directory'],
-        'inst',
-        cls.computer_partition.getId())
-
-
-

software/htmlvalidatorserver/server.xml.in

@@ -5,7 +5,6 @@
       protocol="org.apache.coyote.http11.Http11Protocol"
       address="$${tomcat-configuration:ip}" 
       port="$${tomcat-configuration:port}"
-      maxThreads="10"
       scheme="$${tomcat-configuration:scheme}"
       secure="true"
       clientAuth="false"

software/htmlvalidatorserver/software.cfg

@@ -20,7 +20,7 @@ parts =
 [template-tomcat-configuration]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/server.xml.in
-md5sum = 9978b8b9e567f33cb4c853fee85f1637
+md5sum = fd2562b9ac0c52a2e9cc02e3ef3cef78
 output = ${buildout:directory}/server.xml.in
 mode = 0644
 

software/kvm/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = dc4dc40f9d950b5f963c22c62ca488a7
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = c7ce0510c05753d428c18b756f827573
+md5sum = 352f18067714501c8ccee55f8930d245
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2

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

@@ -108,7 +108,7 @@ config-httpd-port = {{ dumps(kvm_parameter_dict.get('httpd-port', 8081)) }}
 config-disable-ansible-promise = {{ dumps(kvm_parameter_dict.get('disable-ansible-promise', False)) }}
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 config-monitor-username = ${monitor-instance-parameter:username}
-config-monitor-password = ${monitor-htpasswd:passwd}
+config-monitor-password = ${publish-early:monitor-password}
 # Enable disk wipe options
 {% if kvm_parameter_dict.get('wipe-disk-ondestroy', False) -%}
 config-wipe-disk-ondestroy = True
@@ -270,11 +270,16 @@ mode = {{ mode }}
 {{ writefile('cluster-data-content', '${directory:webroot}/${hash-code:passwd}/data', slapparameter_dict.get('cluster-data', ''), '700') }}
 {% endif -%}
 
+[publish-early]
+recipe = slapos.cookbook:publish-early
+-init =
+  monitor-password monitor-htpasswd:passwd
+
 [monitor-instance-parameter]
 monitor-httpd-port = 8060
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 username = admin
-password = ${monitor-htpasswd:passwd}
+password = ${publish-early:monitor-password}
 
 [monitor-base-url-dict]
 {% for key, value in monitor_base_url_dict.items() -%}
@@ -287,6 +292,7 @@ private-path-list +=
 
 [publish-connection-information]
 <= monitor-publish
+-extends = publish-early
 recipe = slapos.cookbook:publish
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}

software/neoppod/stress-testing/runTestSuite.in

+#!{{parameter_dict['runTestSuite_py']}}
+from __future__ import print_function
+import argparse, curses, json, os, subprocess, sys, traceback
+from time import gmtime, strftime, time
+# These are the 2 modules to reuse when using ERP5 for managing test bots.
+# What we do here is currently too new to reuse more from testsuite.
+from erp5.util import taskdistribution
+from erp5.util.testsuite import format_command
+from zc.buildout.buildout import Buildout
+
+{% set vm = parameter_dict['vm'] -%}
+
+dist_list = {{vm['dists'].split()}}
+publish = {{slapparameter_dict.get('publish')}}
+
+
+class DummyTestResult:
+
+  class DummyTestResultLine:
+
+    def stop(self, **kw):
+      with open(self.name + '.json', 'w') as f:
+        json.dump(kw, f)
+
+  done = 0
+
+  def __init__(self, test_name_list):
+    self.test_name_list = test_name_list
+
+  def start(self):
+    test_result_line = self.DummyTestResultLine()
+    try:
+      test_result_line.name = self.test_name_list[self.done]
+    except IndexError:
+      return
+    self.done += 1
+    return test_result_line
+
+
+def main():
+  os.environ.update({k: v.strip() % os.environ
+    for k, v in {{parameter_dict['environment'].items()}}})
+
+  parser = argparse.ArgumentParser(description='Run a test suite.')
+  parser.add_argument('--test_suite', help='The test suite name')
+  parser.add_argument('--test_suite_title', help='The test suite title')
+  parser.add_argument('--test_node_title', help='The test node title')
+  parser.add_argument('--project_title', help='The project title')
+  parser.add_argument('--revision', help='The revision to test',
+                      default='dummy_revision')
+  parser.add_argument('--node_quantity', type=int,
+                      help='Number of CPUs to use for the VM')
+  parser.add_argument('--master_url',
+                      help='The Url of Master controling many suites')
+
+  args = parser.parse_args()
+
+  test_title = args.test_suite_title or args.test_suite
+  if args.master_url:
+    tool = taskdistribution.TaskDistributor(args.master_url)
+    test_result = tool.createTestResult(args.revision,
+                                        dist_list,
+                                        args.test_node_title,
+                                        test_title=test_title,
+                                        project_title=args.project_title)
+    if test_result is None:
+      return
+  else:
+    test_result = DummyTestResult(dist_list)
+
+  Buildout._setup_logging = lambda self: None
+
+  # XXX: fix install of slapos.libnetworkcache in offline mode
+  import slapos.libnetworkcache
+  from zc.buildout.easy_install import buildout_and_setuptools_path
+  path, = slapos.__path__
+  buildout_and_setuptools_path.append(os.path.dirname(path))
+  ###
+
+  fd = os.open('buildout.cfg', os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0666)
+  try:
+    os.write(fd, """\
+[buildout]
+offline = true
+relative-paths = true
+""")
+    Buildout('buildout.cfg', ()).bootstrap(None)
+    os.write(fd, """\
+extends = {{parameter_dict['profile_base_location']}}/stress.cfg
+develop-eggs-directory = {{buildout['develop-eggs-directory']}}
+eggs-directory = {{buildout['eggs-directory']}}
+
+[stress]
+environment =
+vm = {{vm['location']}}
+mount.neoppod = {{parameter_dict['neoppod']}}
+""")
+  finally:
+    os.close(fd)
+  partdir = os.path.join('parts', 'stress')
+  stderr_write = sys.stderr.write
+
+  while 1:
+    test_result_line = test_result.start()
+    if not test_result_line:
+      break
+    dist = test_result_line.name
+
+    cmd = [os.path.join('bin', 'buildout'),
+      'stress:dist=' + dist,
+    ]
+    status_dict = {'command': format_command(*cmd)}
+    print('$', status_dict['command'])
+
+    # Wanted on test result lines:
+    #  status: UNKNOWN in case of buildout failure
+    #  output: stress check if any
+    #  error: buildout traceback or VM's disk usage
+
+    start = time()
+    try:
+      try:
+        p = subprocess.Popen(cmd, stderr=subprocess.PIPE)
+        stderr = []
+        while 1:
+          line = p.stderr.readline()
+          if not line:
+            break
+          stderr_write(line)
+          stderr.append(line)
+        returncode = p.wait()
+      finally:
+        end = time()
+      del p
+      status_dict['stderr'] = ''.join(stderr)
+
+      if not returncode:
+        try:
+          with open(os.path.join(partdir, 'status')) as f:
+            status = int(f.read())
+        except Exception:
+          pass
+        else:
+          status_dict['test_count'] = 1
+          try:
+            curses.setupterm('screen')
+            rmkx = curses.tigetstr('rmkx')
+            with open(os.path.join(partdir, 'stdout')) as f:
+              stdout = f.read()
+            status_dict['stdout'] = stdout[stdout.rindex(rmkx)+len(rmkx):]
+          except Exception:
+            status = -1
+          if status:
+            status_dict['error_count'] = 1
+
+    except Exception:
+      status_dict.setdefault('stderr', traceback.format_exc())
+
+    test_result_line.stop(
+      date = strftime("%Y/%m/%d %H:%M:%S", gmtime(end)),
+      duration = end - start,
+      **status_dict)
+
+
+if __name__ == "__main__":
+    main()

software/neoppod/stress-testing/software.cfg

+[buildout]
+extends =
+  ../software.cfg
+  ../../../component/vm-img/debian.cfg
+parts =
+  slapos-cookbook
+  template
+  neoppod-develop
+  neolog
+
+[template]
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/template.cfg
+template =
+  inline:[buildout]
+  eggs-directory = ${buildout:eggs-directory}
+  develop-eggs-directory = ${buildout:develop-eggs-directory}
+  parts = runTestSuite
+  [slap-configuration]
+  recipe = slapos.cookbook:slapconfiguration.serialised
+  computer = $${slap-connection:computer-id}
+  partition = $${slap-connection:partition-id}
+  url = $${slap-connection:server-url}
+  key = $${slap-connection:key-file}
+  cert = $${slap-connection:cert-file}
+  [directory]
+  recipe = slapos.cookbook:mkdirectory
+  bin = $${buildout:directory}/bin
+  [runTestSuite]
+  recipe = slapos.recipe.template:jinja2
+  rendered = $${directory:bin}/$${:_buildout_section_name_}
+  template = ${:_profile_base_location_}/$${:_buildout_section_name_}.in
+  mode = 0755
+  context =
+    section buildout buildout
+    section parameter_dict runTestSuite-parameters
+    key slapparameter_dict slap-configuration:configuration
+  [runTestSuite-parameters]
+  environment = {{dumps(environment)}}
+  vm = {{dumps(vm)}}
+  runTestSuite_py = ${buildout:bin-directory}/${runTestSuite_py:interpreter}
+  profile_base_location = ${:_profile_base_location_}
+  neoppod = ${neoppod-repository:location}
+context =
+  section environment vm-run-environment
+  section vm vm-debian
+
+[runTestSuite_py]
+eggs +=
+  zc.buildout
+  slapos.libnetworkcache
+
+# Just in case one wants to inspect logs on the testnode itself.
+[neolog]
+recipe = zc.recipe.egg
+eggs =
+  ${msgpack-python:egg}
+  neoppod
+scripts = neolog
+
+[neoppod-repository]
+# When run from erp5.util:testnode (and this always the case), shared=true is
+# added to this section and the path in .git/objects/info/alternates is outside
+# the 'neoppod' mount point of the VM. Let's mount the testnode working copy
+# directly. Comment the following 2 lines if 'repository' is a URL.
+recipe =
+location = ${:repository}
+
+[vm-debian]
+# Mainly for logs, otherwise 2G would enough (<100M for the SR).
+size = 8Gi
+late-command +=
+  echo tmpfs /tmp tmpfs mode=1777,size=90% 0 0 >>/etc/fstab
+packages +=
+# dependencies to build a SlapOS SR without slapos-node
+  ca-certificates file g++ libc6-dev make patch python
+# speed up build by using the following components from the OS
+  git liblzma-dev libssl-dev pkg-config python-dev
+# extra requirements for NEO
+  libnetfilter-queue-dev nftables
+# extra requirements for this SR
+  screen xz-utils
+
+[versions]
+slapos.recipe.template = 4.3

software/neoppod/stress-testing/stress

+#!/usr/bin/python
+import curses, os, subprocess, sys, tempfile, threading, time
+from functools import partial
+curses.setupterm()
+
+result = partial(os.path.join, sys.argv[1])
+duration = int(sys.argv[2])
+
+cmd = sys.argv[3:]
+cmd[cmd.index('--')] = 'run'
+cmd[:0] = 'bin/py', 'parts/neoppod-repository/tools/stress', '-l', '../log'
+
+p = subprocess.Popen(cmd, stdin=subprocess.PIPE)
+time.sleep(10)
+p.stdin.write(curses.tigetstr("kf1"))
+t = threading.Timer(duration, p.stdin.write, ('q',))
+t.daemon = True
+try:
+    t.start()
+    returncode = p.wait()
+finally:
+    t.cancel()
+
+with open(result('status'), 'wb') as f:
+    f.write(str(returncode))
+
+if returncode:
+    subprocess.call(
+        ('tar', '-caf', result('log.tar.xz'), 'log'),
+        cwd=os.pardir)
+    subprocess.call(
+        ('tar', '-caf', result('db.tar.xz'), 'neo_tests'),
+        cwd=tempfile.gettempdir())

software/neoppod/stress-testing/stress.cfg

+[buildout]
+extends =
+  ../../../component/vm-img/debian.cfg
+parts =
+  stress
+
+[stress]
+<= vm-run-base
+smp = 8
+# NEO processes take ~2G with default settings,
+# the rest is mainly for the DB (which is in tmpfs)
+mem = 4096
+duration = 3600
+stress-args =
+run-args = -L .24 -r 0
+mount.slapos = ${:_profile_base_location_}/../../..
+command =
+  mkdir log software
+  cd software
+  cat <<EOF >buildout.cfg
+  [buildout]
+  extends =
+    /mnt/slapos/software/neoppod/software.cfg
+    /mnt/slapos/software/neoppod/sqlite-mixin.cfg
+  parts =
+    neoppod-develop
+    neoppod
+  develop = /mnt/slapos
+  extensions -= slapos.rebootstrap
+  [slapos-cookbook-develop]
+  recipe =
+  setup =
+  [neoppod-repository]
+  repository = /mnt/neoppod
+  shared = true
+  [neoppod]
+  eggs +=
+    NetfilterQueue
+    gevent
+  interpreter = py
+  [versions]
+  slapos.cookbook =
+  NetfilterQueue = 0.8.1
+  greenlet = 0.4.15
+  gevent = 1.3.7
+  cffi = 1.11.5
+  # use the following components from the OS
+  # and don't build dependencies for nothing
+  [git]
+  recipe =
+  location = /usr
+  environment =
+  configure-options =
+  [openssl]
+  recipe =
+  location = /usr
+  configure-options =
+  make-options =
+  make-targets =
+  environment =
+  [perl]
+  recipe =
+  location = /usr
+  configure-command =
+  environment =
+  [pkgconfig]
+  recipe =
+  location = /usr
+  environment =
+  [python2.7]
+  recipe =
+  location = /usr
+  environment =
+  [xz-utils]
+  recipe =
+  location = /usr
+  EOF
+  python -S /mnt/buildout/bin/buildout bootstrap
+  MAKEFLAGS=-j${:smp} bin/buildout
+  df ~ /tmp >&2
+  screen -L -Logfile $PARTDIR/stdout -D -m sudo /mnt/slapos/software/neoppod/stress-testing/stress $PARTDIR ${:duration} ${:stress-args} -- ${:run-args}
+  df ~ /tmp >&2

software/nextcloud/test/test.py

@@ -57,7 +57,7 @@ class NextCloudTestCase(InstanceTestCase):
       path = os.path.join(partition_path, 'srv/www')
       if os.path.exists(path):
         self.nextcloud_path = path
-        self.instance_folder = partition_path
+        self.partition_dir = partition_path
         break
     self.assertTrue(
         self.nextcloud_path,
@@ -174,6 +174,7 @@ class NextCloudTestCase(InstanceTestCase):
 
 
 class TestServices(NextCloudTestCase):
+  __partition_reference__ = 'ncs'
 
   def test_process_list(self):
     hash_list = [
@@ -251,7 +252,7 @@ class TestServices(NextCloudTestCase):
       "richdocuments",
       "wopi_url"
     ])
-    self.assertEqual(collabora_config.strip(), 'https://collabora.host.vifib.net/')
+    self.assertEqual(collabora_config.strip(), b'https://collabora.host.vifib.net/')
     stun_config = subprocess.check_output([
       php_bin,
       occ,
@@ -259,7 +260,7 @@ class TestServices(NextCloudTestCase):
       "spreed",
       "stun_servers"
     ])
-    self.assertEqual(stun_config.strip(), '["turn.vifib.com:5349"]')
+    self.assertEqual(stun_config.strip(), b'["turn.vifib.com:5349"]')
     turn_config = subprocess.check_output([
       php_bin,
       occ,
@@ -267,17 +268,16 @@ class TestServices(NextCloudTestCase):
       "spreed",
       "turn_servers"
     ])
-    self.assertEqual(turn_config.strip(), '[{"server":"","secret":"","protocols":"udp,tcp"}]')
-    news_config_file = os.path.join(self.instance_folder, 'srv/data/news/config/config.ini')
+    self.assertEqual(turn_config.strip(), b'[{"server":"","secret":"","protocols":"udp,tcp"}]')
+    news_config_file = os.path.join(self.partition_dir, 'srv/data/news/config/config.ini')
     with open(news_config_file) as f:
       config = f.read()
-      regex = r"(useCronUpdates\s+=\s+false)"
-      result = re.search(regex, config)
-      self.assertNotEqual(result, None)
-
+    self.assertRegexpMatches(config, r"(useCronUpdates\s+=\s+false)")
 
 
 class TestNextCloudParameters(NextCloudTestCase):
+  __partition_reference__ = 'ncp'
+
   @classmethod
   def getInstanceParameterDict(cls):
     return {
@@ -349,7 +349,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       "richdocuments",
       "wopi_url"
     ])
-    self.assertEqual(collabora_config.strip(), 'https://my-custom.collabora.net')
+    self.assertEqual(collabora_config.strip(), b'https://my-custom.collabora.net')
     stun_config = subprocess.check_output([
       php_bin,
       occ,
@@ -357,7 +357,7 @@ class TestNextCloudParameters(NextCloudTestCase):
       "spreed",
       "stun_servers"
     ])
-    self.assertEqual(stun_config.strip(), '["stun.example.net:5439"]')
+    self.assertEqual(stun_config.strip(), b'["stun.example.net:5439"]')
     turn_config = subprocess.check_output([
       php_bin,
       occ,
@@ -365,5 +365,6 @@ class TestNextCloudParameters(NextCloudTestCase):
       "spreed",
       "turn_servers"
     ])
-    self.assertEqual(turn_config.strip(),
-                     '[{"server":"turn.example.net:5439","secret":"c4f0ead40a49bbbac3c58f7b9b43990f78ebd96900757ae67e10190a3a6b6053","protocols":"udp,tcp"}]')
+    self.assertEqual(
+        turn_config.strip(),
+        b'[{"server":"turn.example.net:5439","secret":"c4f0ead40a49bbbac3c58f7b9b43990f78ebd96900757ae67e10190a3a6b6053","protocols":"udp,tcp"}]')

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 4179c998a71bd87b0f0bd624d545071b
+md5sum = 7c1a5a4f1a3916ddf3ec0db7b22ef820

software/seleniumserver/instance-selenium.cfg.in

@@ -93,11 +93,17 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
 java-args = -Dwebdriver.gecko.driver=${geckodriver-0.22.0:location}
 port = 7778
 
+[selenium-server-node-instance-firefox-68]
+<= selenium-server-node-instance
+capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-68:version},firefox_binary=${firefox-wrapper-68:location}
+java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
+port = 7779
+
 [selenium-server-node-instance-chromium-69]
 <= selenium-server-node-instance
 capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-69:version},chrome_binary=${chromium-wrapper-69:location}
 java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-2.41:location}
-port = 7779
+port = 7780
 
 
 [selenium-server-admin-password]
@@ -236,6 +242,7 @@ instance-promises =
   $${selenium-server-hub-listen-promise:path}
   $${selenium-server-node-firefox-52-listen-promise:path}
   $${selenium-server-node-firefox-60-listen-promise:path}
+  $${selenium-server-node-firefox-68-listen-promise:path}
   $${selenium-server-node-instance-chromium-69-listen-promise:path}
 
 
@@ -268,6 +275,11 @@ port = $${selenium-server-node-instance-firefox-52:port}
 hostname = $${selenium-server-node-instance-firefox-60:hostname}
 port = $${selenium-server-node-instance-firefox-60:port}
 
+[selenium-server-node-firefox-68-listen-promise]
+<= check-port-listening-promise
+hostname = $${selenium-server-node-instance-firefox-68:hostname}
+port = $${selenium-server-node-instance-firefox-68:port}
+
 [selenium-server-node-instance-chromium-69-listen-promise]
 <= check-port-listening-promise
 hostname = $${selenium-server-node-instance-chromium-69:hostname}

software/seleniumserver/test/test.py

@@ -401,6 +401,11 @@ class TestFirefox60(BrowserCompatibilityMixin, SeleniumServerTestCase):
   user_agent = 'Gecko/20100101 Firefox/60.0'
 
 
+class TestFirefox68(BrowserCompatibilityMixin, SeleniumServerTestCase):
+  desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='68.0.2esr')
+  user_agent = 'Gecko/20100101 Firefox/68.0'
+
+
 class TestChrome69(BrowserCompatibilityMixin, SeleniumServerTestCase):
   desired_capabilities = dict(DesiredCapabilities.CHROME, version='69.0.3497.0')
   user_agent = 'Chrome/69.0.3497.0'

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 58a6f21021279ae52c91813f61cdbdd7
+md5sum = 19475112d4dccee1263798c67fd2351b
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -50,7 +50,7 @@ md5sum = 525e37ea8b2acf6209869999b15071a6
 
 [template-slapos-cfg]
 filename = template/slapos.cfg.in
-md5sum = 035e027e9cb9bbdca0509ac895fc4696
+md5sum = da113b3e3e7bac9cc215fede7c4911a5
 
 [template-parameters]
 filename = parameters.xml.in
@@ -58,7 +58,7 @@ md5sum = f8446fcf254b4929eb828a9a1d7e5f62
 
 [template-bash-profile]
 filename = template/bash_profile.in
-md5sum = 37eea89042a58127c85e6b3886260e59
+md5sum = 7645048216fcf957f7773534cd0408dc
 
 [template-supervisord]
 filename = template/supervisord.conf.in
@@ -78,4 +78,8 @@ md5sum = 2451072826a9ad9425d62c9e9c7f6284
 
 [template-slapuser-script]
 filename = template/slapos-slapuser-script.in
-md5sum = becafae59ab9973724e0edb238f4cb7a
+md5sum = 75aab99c995ca841f93fc77fc9116c37
+
+[template-buildout-shared-part-list]
+filename = template/buildout-shared-part-list.in
+md5sum = 3203c9ad0b30d3ee39a809a067efff8d
\ No newline at end of file

software/slaprunner/instance-runner.cfg

@@ -120,6 +120,10 @@ recipe = slapos.cookbook:mkdirectory
 home = $${buildout:directory}
 etc = $${:home}/etc/
 var = $${:home}/var/
+# This srv path has an extra slash, which will cause runnerdirectory:home
+# to be .../srv//runner/.. but for compatibility reasons we don't fix this,
+# because this is the path that will be used as software URL installed by
+# webrunner and would cause software release hash to become different.
 srv = $${:home}/srv/
 bin = $${:home}/bin/
 tmp = $${:home}/tmp/
@@ -146,6 +150,7 @@ project = $${:home}/project
 public = $${:home}/public
 software-root = {{ slapparameter_dict.get('software-root', '$${:home}/software') }}
 instance-root = $${:home}/instance
+shared-root = $${:home}/shared
 project-test = $${:test}/project
 software-test = $${:test}/software
 instance-test = $${:test}/instance
@@ -165,6 +170,8 @@ working-directory = $${runnerdirectory:home}
 project-directory = $${runnerdirectory:project}
 instance_root = $${runnerdirectory:instance-root}
 software_root = $${runnerdirectory:software-root}
+shared_root = $${runnerdirectory:shared-root}
+buildout-shared-part-list-dump = ${template-buildout-shared-part-list:output}
 pidfile-software = $${directory:run}/slapgrid-cp.pid
 pidfile-instance = $${directory:run}/slapgrid-sr.pid
 ssh_client = ${openssh:location}/bin/ssh
@@ -257,7 +264,7 @@ template = inline:
   PasswordAuthentication no
   PubkeyAuthentication yes
   AuthorizedKeysFile $${buildout:directory}/.ssh/authorized_keys
-  ForceCommand if [ -z "$SSH_ORIGINAL_COMMAND" ]; then $${shell-environment:shell} -l; else SHELL=$${shell-environment:shell} PATH=$${shell-environment:path} eval "$SSH_ORIGINAL_COMMAND"; fi
+  ForceCommand cd $${directory:home}; if [ -z "$SSH_ORIGINAL_COMMAND" ]; then HOME=$${directory:home} $${shell-environment:shell} -l; else HOME=$${directory:home} SHELL=$${shell-environment:shell} PATH=$${shell-environment:path} eval "$SSH_ORIGINAL_COMMAND"; fi
   Subsystem sftp ${openssh:location}/libexec/sftp-server
 
 [runner-sshd-raw-server]
@@ -326,6 +333,27 @@ recipe = slapos.cookbook:dropbear.add_authorized_key
 home = $${buildout:directory}
 key = $${slap-parameter:user-authorized-key}
 
+[runner-sshkeys-publickey-fingerprint-cmd]
+recipe = plone.recipe.command
+command = bash -o pipefail -c "$${runner-sshkeys-authority:keygen-binary} -lf $${runner-sshkeys-sshd:public-key} | cut  -f 2 -d\ | sed 's/+/%2B/g' | sed 's/\//%2F/g' | sed 's/SHA256://'"
+
+[runner-sshkeys-publickey-fingerprint-shelloutput]
+recipe = collective.recipe.shelloutput
+# XXX because collective.recipe.shelloutput ignore errors, we run the same
+# command in a plone.recipe.command so that if fails if something goes wrong.
+commands =
+  fingerprint = $${runner-sshkeys-publickey-fingerprint-cmd:command}
+
+[runner-sshkeys-publickey-fingerprint]
+# fingerprint for ssh url, see
+# https://tools.ietf.org/id/draft-salowey-secsh-uri-00.html#connparam
+# https://winscp.net/eng/docs/session_url#hostkey
+
+# format is host-key-alg-fingerprint, but we know that
+# $${runner-sshkeys-sshd:public-key} is rsa so for host-key-alg
+# we just use use rsa.
+fingerprint = ssh-rsa-$${runner-sshkeys-publickey-fingerprint-shelloutput:fingerprint}
+
 #---------------------------
 #--
 #-- Set nginx frontend
@@ -612,6 +640,7 @@ backend-url = $${slaprunner:access-url}
 init-user = $${runner-htpasswd:user}
 init-password = $${runner-htpasswd:password}
 ssh-command = ssh $${user-info:pw-name}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
+ssh-url = ssh://$${user-info:pw-name};fingerprint=$${runner-sshkeys-publickey-fingerprint:fingerprint}@[$${slap-network-information:global-ipv6}]:$${runner-sshd-port:port}
 git-public-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
 git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
 monitor-base-url = $${monitor-publish-parameters:monitor-base-url}
@@ -681,6 +710,8 @@ rendered = $${slaprunner:slapos.cfg}
 mode = 700
 context =
   section slaprunner slaprunner
+  import codecs codecs
+  raw buildout_shared_part_list_dump ${template-buildout-shared-part-list:output}
 
 [slapos-test-cfg]
 recipe = slapos.recipe.template:jinja2
@@ -773,8 +804,13 @@ rendered = $${buildout:directory}/.bash_profile
 context =
     raw path $${shell-environment:path}
     raw shell $${shell-environment:shell}
+    key terminfo terminfo:location
     key instance_name slap-parameter:instance-name
     key workdir runnerdirectory:home
+    key home directory:home
+
+[terminfo]
+location = ${ncurses:location}/share/terminfo/
 
 #---------------------------
 #--

software/slaprunner/software.cfg

@@ -27,6 +27,10 @@ extends =
   ../../stack/logrotate/buildout.cfg
   ../../stack/monitor/buildout.cfg
 
+# make sure shared-part-list is available, even for old versions
+# of slapos who do not set that.
+shared-part-list =
+
 # stacks are listed from most generic to most specific,
 # to avoid versioning issues
 
@@ -131,6 +135,10 @@ filename = resilient_software_release_information.py.in
 < = template-download-base
 filename = slapos-slapuser-script.in
 
+[template-buildout-shared-part-list]
+< = template-base
+output = ${buildout:directory}/buildout-shared-part-list
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -140,6 +148,7 @@ eggs =
   erp5.util
   lock-file
   plone.recipe.command
+  collective.recipe.shelloutput
   slapos.recipe.build
   slapos.toolbox[flask_auth]
   gunicorn==19.7.1
@@ -162,6 +171,7 @@ gunicorn = 19.7.1
 prettytable = 0.7.2
 pycurl = 7.43.0
 slapos.recipe.template = 4.3
+collective.recipe.shelloutput = 0.1
 collective.recipe.environment = 0.2.0
 smmap = 0.9.0
 lockfile = 0.12.2

software/slaprunner/template/bash_profile.in

@@ -3,6 +3,7 @@
 # If you want to load your custom bash configuration, please use a .bashrc file
 
 cd {{ workdir }}
+export HOME={{- home }}
 export PATH={{- path }}
 export SHELL={{- shell }}
 {%- if instance_name %}
@@ -10,6 +11,8 @@ export PROMPT_COMMAND='echo -en "\033]0;{{-instance_name}}\a"'
 {% endif %}
 export PS1="$ "
 
+export TERMINFO={{- terminfo }}
+
 if [ -f "$HOME/.bashrc" ] ; then
   source $HOME/.bashrc
 fi

software/slaprunner/template/buildout-shared-part-list.in

+${buildout:shared-part-list}
\ No newline at end of file

software/slaprunner/template/slapos-slapuser-script.in

 #!/bin/sh
 # run slapos command inside slaprunner with appropriate config
 
-SLAPOS_CONFIGURATION={{ config_location }}   \
-SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION   \
+export SLAPOS_CONFIGURATION=${SLAPOS_CONFIGURATION-"{{ config_location }}"}
+export SLAPOS_CLIENT_CONFIGURATION=${SLAPOS_CLIENT_CONFIGURATION-$SLAPOS_CONFIGURATION}
 exec {{ slapos_python_file_location }} "$@"

software/slaprunner/template/slapos.cfg.in

 [slapos]
 software_root = {{ slaprunner['software_root'] }}
 instance_root = {{ slaprunner['instance_root'] }}
+shared_part_list =
+  {#- buildout_shared_part_list_dump is ${buildout:shared-part-list} rendered as a
+  template during software step.
+  Because it can contain new lines, it's not possible to use it directly when generating
+  buildout config files from buildout, because the newlines don't get indented and cause
+  the instance buildout to be invalid ini file.
+  So we had to dump it in a simple text file and now we parse again that text file. -#}
+  {%- for line in codecs.open(buildout_shared_part_list_dump).readlines() %}
+  {{   line.strip() }}
+  {%- endfor %}
+  {{ slaprunner['shared_root'] }}
 master_url = http://{{ slaprunner['ipv4'] }}:{{ slaprunner['proxy_port'] }}
 computer_id = slaprunner
 maximal_delay = 0

software/slaprunner/test/setup.py

@@ -47,6 +47,9 @@ setup(name=name,
           'erp5.util',
           'supervisor',
           'psutil',
+          'paramiko',
+          'six',
+          'requests',
       ],
       zip_safe=True,
       test_suite='test',

software/slaprunner/test/test.py

@@ -26,6 +26,18 @@
 ##############################################################################
 
 import os
+import unittest
+import paramiko
+import contextlib
+import base64
+import hashlib
+import subprocess
+
+from six.moves.urllib.parse import urlparse
+from six.moves.urllib.parse import quote
+from six.moves.urllib.parse import urljoin
+from six.moves.configparser import ConfigParser
+import requests
 
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
@@ -40,6 +52,193 @@ class SlaprunnerTestCase(SlapOSInstanceTestCase):
   __partition_reference__ = 's'
 
 
+class TestWeb(SlaprunnerTestCase):
+  def test_slaprunner(self):
+    # slaprunner main interface is password protected
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    url = parameter_dict['url']
+    resp = requests.get(url, verify=False)
+    self.assertEqual(requests.codes.unauthorized, resp.status_code)
+    resp = requests.get(
+        url,
+        verify=False,
+        auth=(parameter_dict['init-user'], parameter_dict['init-password']))
+    self.assertEqual(requests.codes.ok, resp.status_code)
+    self.assertIn('SlapOS', resp.text)
+
+  def test_shellinabox(self):
+    # shellinabox exists at /shellinabox and is password protected
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    url = urljoin(parameter_dict['url'], '/shellinabox')
+    resp = requests.get(url, verify=False)
+    self.assertEqual(requests.codes.unauthorized, resp.status_code)
+    resp = requests.get(
+        url,
+        verify=False,
+        auth=(parameter_dict['init-user'], parameter_dict['init-password']))
+    self.assertEqual(requests.codes.ok, resp.status_code)
+    self.assertIn('ShellInABox', resp.text)
+    self.assertNotIn('SlapOS', resp.text)
+
+  def test_public_url(self):
+    # ~/srv/runner/public/ is served over http
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    public_url = parameter_dict['public-url']
+
+    hello_file = os.path.join(
+        self.computer_partition_root_path,
+        'srv',
+        'runner',
+        'public',
+        'hello.html')
+    self.addCleanup(os.remove, hello_file)
+    with open(hello_file, 'w') as f:
+      f.write('<b>Hello</b>')
+
+    index = requests.get(public_url, verify=False)
+    self.assertEqual(requests.codes.ok, index.status_code)
+    self.assertIn('hello.html', index.text)
+
+    hello = requests.get(urljoin(public_url, 'hello.html'), verify=False)
+    self.assertEqual(requests.codes.ok, hello.status_code)
+    self.assertIn('<b>Hello</b>', hello.text)
+
+  # git seems broken, these are 404 now...
+  @unittest.expectedFailure
+  def test_git_private(self):
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    url = parameter_dict['git-private']
+    resp = requests.get(url, verify=False)
+    self.assertEqual(requests.codes.unauthorized, resp.status_code)
+    resp = requests.get(
+        url,
+        verify=False,
+        auth=(parameter_dict['init-user'], parameter_dict['init-password']))
+    self.assertEqual(requests.codes.ok, resp.status_code)
+
+  @unittest.expectedFailure
+  def test_git_public(self):
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    url = parameter_dict['git-public']
+    resp = requests.get(url, verify=False)
+    self.assertEqual(requests.codes.ok, resp.status_code)
+
+
+class TestSSH(SlaprunnerTestCase):
+  @classmethod
+  def getInstanceParameterDict(cls):
+    cls.ssh_key = paramiko.RSAKey.generate(1024)
+    return {
+        'user-authorized-key': 'ssh-rsa {}'.format(cls.ssh_key.get_base64())
+    }
+
+  def test_connect(self):
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    ssh_url = parameter_dict['ssh-url']
+    parsed = urlparse(ssh_url)
+    self.assertEqual('ssh', parsed.scheme)
+
+    # username contain a fingerprint (only, so we simplify the parsing)
+    #
+    # relevant parts of the grammar defined in
+    # https://tools.ietf.org/id/draft-salowey-secsh-uri-00.html
+    #
+    #   ssh-info      =  [ userinfo ] [";" c-param *("," c-param)]
+    #   c-param       =  paramname "=" paramvalue
+    ssh_info = parsed.username
+    username, fingerprint_from_url = ssh_info.split(';fingerprint=')
+    client = paramiko.SSHClient()
+
+    self.assertTrue(fingerprint_from_url.startswith('ssh-rsa-'), '')
+    fingerprint_from_url = fingerprint_from_url[len('ssh-rsa-'):]
+
+    class KeyPolicy(object):
+      """Accept server key and keep it in self.key for inspection
+      """
+      def missing_host_key(self, client, hostname, key):
+        self.key = key
+
+    key_policy = KeyPolicy()
+    client.set_missing_host_key_policy(key_policy)
+
+    with contextlib.closing(client):
+      client.connect(
+          username=username,
+          hostname=parsed.hostname,
+          port=parsed.port,
+          pkey=self.ssh_key,
+      )
+      # Check fingerprint from server matches the published one.
+      # Paramiko does not allow to get the fingerprint as SHA256 easily yet
+      # https://github.com/paramiko/paramiko/pull/1103
+      self.assertEqual(
+          fingerprint_from_url,
+          quote(
+              # base64 encoded fingerprint adds an extra = at the end
+              base64.b64encode(
+                  hashlib.sha256(key_policy.key.asbytes()).digest())[:-1],
+              # also encode /
+              safe=''))
+
+      # Check shell is usable
+      channel = client.invoke_shell()
+      channel.settimeout(30)
+      received = ''
+      while True:
+        r = channel.recv(1024)
+        self.logger.debug("received >%s<", r)
+        if not r:
+          break
+        received += r
+        if 'slaprunner shell' in received:
+          break
+      self.assertIn("Welcome to SlapOS slaprunner shell", received)
+
+      # simple commands can also be executed ( this would be like `ssh bash -c 'pwd'` )
+      self.assertEqual(
+          self.computer_partition_root_path,
+          client.exec_command("pwd")[1].read(1000).strip())
+
+
+class TestSlapOS(SlaprunnerTestCase):
+  def test_slapos_command(self):
+    # in ~/bin/slapos there is a wrapper setting configuration to use slapos from
+    # the web runner.
+    proxy_show_output = subprocess.check_output(
+        (
+            os.path.join(self.computer_partition_root_path, 'bin', 'slapos'),
+            'proxy',
+            'show',
+        ),
+        env={})
+    self.assertIn('slaprunner', proxy_show_output)
+
+  def test_shared_part_list(self):
+    # this slapos used shared_part_list
+    cfg_parser = ConfigParser()
+    with open(os.path.join(self.computer_partition_root_path,
+                           'etc',
+                           'slapos.cfg')) as f:
+      cfg_parser.readfp(f)
+    shared_part_list = cfg_parser.get('slapos', 'shared_part_list').splitlines()
+
+    # web runner own shared parts. Note that there is intentionnaly a double
+    # slash in this path, because slaprunner has double slash in paths since
+    # early releases, including for the path of slapos repository that will be
+    # used to develop and install software. If we fix this duplication, then
+    # the URL of installed software will be different and it will get a different
+    # hash and be reinstalled. To prevent this, we keep that // between srv and runner.
+    self.assertEqual(
+        '{}/srv//runner//shared'.format(self.computer_partition_root_path.rstrip('/')),
+        shared_part_list[-1])
+
+    # shared parts from outer slapos
+    outer_shared_part_list = os.getenv('SLAPOS_TEST_SHARED_PART_LIST',
+                                       '').split(os.pathsep)
+    for outer_shared_part in outer_shared_part_list:
+      self.assertIn(outer_shared_part, shared_part_list)
+
+
 class ServicesTestCase(SlaprunnerTestCase):
   def test_hashes(self):
     hash_files = [

stack/erp5/buildout.cfg

@@ -518,6 +518,7 @@ eggs = ${neoppod:eggs}
 # Needed for checking ZODB Components source code
   pylint
   pytracemalloc
+  xlrd
 
 # Zope
   Zope2
@@ -759,6 +760,7 @@ dask = 0.18.1
 toolz = 0.9.0
 zope.globalrequest = 1.5
 waitress = 1.3.0
+xlrd = 1.1.0
 
 # Re-add for as it is required to be there for uninstallation
 erp5.recipe.w3validator = 1.0.2

stack/lamp/buildout.cfg

@@ -126,7 +126,7 @@ md5sum = 9d3eb7fcc44ac25bef8ee9df6eac8974
 <= template-download-base
 filename = instance-lamp.cfg.jinja2.in
 output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
-md5sum = 2f8b021acc9c7a849641680a249d5a36
+md5sum = cefe97d3a80d10655212d64ced180b2a
 
 [template-apache.conf]
 <= template-download-base
@@ -150,6 +150,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
+  ${pycurl:egg}
   slapos.toolbox
 
 [versions]

stack/lamp/instance-lamp.cfg.jinja2.in

@@ -104,7 +104,7 @@ recipe = slapos.cookbook:publish-early
 monitor-httpd-port = 8060
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }} 
 username = admin
-password = ${monitor-htpasswd:passwd}
+password = ${publish-early:monitor-password}
 
 [monitor-base-url-dict]
 {% for key, value in monitor_base_url_dict.items() -%}

stack/slapos.cfg

@@ -130,19 +130,19 @@ netaddr = 0.7.19
 pbr = 2.0.0
 plone.recipe.command = 1.1
 prettytable = 0.7.2
-psutil = 5.4.3
+psutil = 5.6.3
 pyOpenSSL = 18.0.0
 pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
 slapos.cookbook = 1.0.123
-slapos.core = 1.5.0
+slapos.core = 1.5.1
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.19
 slapos.rebootstrap = 4.2
-slapos.recipe.build = 0.41
+slapos.recipe.build = 0.42
 slapos.recipe.cmmi = 0.11
 slapos.toolbox = 0.95
 stevedore = 1.21.0