Update Release Candidate

component/haproxy/buildout.cfg

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

component/jpegoptim/buildout.cfg

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

component/optipng/buildout.cfg

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

component/trafficserver/buildout.cfg

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

release-sr

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

software/caddy-frontend/CHANGES.caddy_frontend.rst

@@ -3,6 +3,12 @@ Changes
 
 Here are listed the most important changes, which might affect upgrades.
 
+1.0.159 (2020-07-30)
+--------------------
+
+ * logs are ensured to be available in slave's ``log-access-url``
+ * logs from backend Haproxy are also available to slaves
+
 1.0.158 (2020-07-24)
 --------------------
 

software/caddy-frontend/README.caddy_frontend.rst

@@ -245,17 +245,6 @@ Necessary to activate cache.
 
 ``enable_cache`` is an optional parameter.
 
-Functionalities for Caddy configuration
----------------------------------------
-
-In the slave Caddy configuration you can use parameters that will be replaced during instantiation. They should be entered as python templates parameters ex: ``%(parameter)s``:
-
-  * ``cache_access`` : url of the cache. Should replace backend url in configuration to use the cache
-  * ``access_log`` : path of the slave error log in order to log in a file.
-  * ``error_log`` : path of the slave access log in order to log in a file.
-  * ``certificate`` : path to the certificate
-
-
 Examples
 ========
 

software/caddy-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 99f2f6d8818da4a98ca48412453c4f90
+md5sum = dae3bf6daf851b5610a1a6bd83057b29
 
 [template-common]
 filename = instance-common.cfg.in
@@ -22,7 +22,7 @@ md5sum = c801b7f9f11f0965677c22e6bbe9281b
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 23237969bbd9e974ac674b2052e8d67c
+md5sum = 43b3763d4086283e9c7c886e3b89e54b
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
@@ -30,7 +30,7 @@ md5sum = 19debfbc27c464f451b1eb5bb5ce3c84
 
 [template-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = e142dad44db1a25d46a31661aa2f075f
+md5sum = 8f518a7b543126ce91fe218255fb201c
 
 [template-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -114,8 +114,8 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [template-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 9d6111a5d6bc07e708116ca331925241
+md5sum = f77744e52f9d028c39f99cfbf31eadaf
 
-[template-rsyslogd-conf]
-_update_hash_filename_ = templates/rsyslogd.conf.in
-md5sum = 6f0fd930ffb3230b7e8c781f88693d69
+[template-backend-haproxy-rsyslogd-conf]
+_update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in
+md5sum = be899b04e1aa652ed510f20d4ea523dd

software/caddy-frontend/common.cfg

@@ -113,7 +113,7 @@ xz_location = ${xz-utils:location}
 
 monitor_template = ${monitor-template:output}
 template_backend_haproxy_configuration = ${template-backend-haproxy-configuration:target}
-template_rsyslogd_conf = ${template-rsyslogd-conf:target}
+template_backend_haproxy_rsyslogd_conf = ${template-backend-haproxy-rsyslogd-conf:target}
 template_caddy_frontend_configuration = ${template-caddy-frontend-configuration:target}
 template_graceful_script = ${template-graceful-script:target}
 template_validate_script = ${template-validate-script:target}
@@ -228,5 +228,5 @@ mode = 0644
 [template-configuration-state-script]
 <=download-template
 
-[template-rsyslogd-conf]
+[template-backend-haproxy-rsyslogd-conf]
 <=download-template

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

@@ -43,12 +43,14 @@ parts =
   monitor-caddy-server-status-wrapper
   monitor-verify-re6st-connectivity
 
+  backend-haproxy-rsyslogd-configuration
+  backend-haproxy-rsyslogd
+  logrotate-entry-backend-haproxy
   backend-haproxy
   backend-haproxy-graceful
   promise-backend-haproxy-http
   promise-backend-haproxy-https
   promise-backend-haproxy-configuration
-  logrotate-entry-backend-haproxy
 
 # Create all needed directories
 [directory]
@@ -157,7 +159,7 @@ context =
 template-empty = {{ parameter_dict['template_empty'] }}
 template-default-slave-virtualhost = {{ parameter_dict['template_default_slave_virtualhost'] }}
 template-backend-haproxy-configuration = {{ parameter_dict['template_backend_haproxy_configuration'] }}
-template-rsyslogd-conf = {{ parameter_dict['template_rsyslogd_conf'] }}
+template-backend-haproxy-rsyslogd-conf = {{ parameter_dict['template_backend_haproxy_rsyslogd_conf'] }}
 caddy-location = {{ parameter_dict['caddy_location'] }}
 
 [kedifa-login-config]
@@ -423,7 +425,7 @@ rendered = ${directory:bbb-ssl-dir}/frontend.crt
 <= logrotate-entry-base
 name = caddy
 log = ${caddy-configuration:error-log} ${caddy-configuration:access-log}
-rotate-num = 30
+rotate-num = ${configuration:rotate-num}
 # Note: Slaves do not define their own reload, as this would be repeated,
 #       because sharedscripts work per entry, and each slave needs its own
 #       olddir
@@ -698,7 +700,7 @@ config-port = ${backend-haproxy-configuration:https-port}
 [backend-haproxy-configuration]
 file = ${directory:etc}/backend-haproxy.cfg
 pid-file = ${directory:run}/backend-haproxy.pid
-log-socket = ${backend-haproxy-rsyslogd:log-socket}
+log-socket = ${backend-haproxy-rsyslogd-config:log-socket}
 graceful-command = ${backend-haproxy-validate:rendered} && kill -USR2 $(cat ${:pid-file})
 http-port = ${configuration:backend-haproxy-http-port}
 https-port = ${configuration:backend-haproxy-https-port}
@@ -716,12 +718,29 @@ command-line = {{ parameter_dict['haproxy_executable'] }} -f ${backend-haproxy-c
 wrapper-path = ${directory:service}/backend-haproxy
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
+[backend-haproxy-rsyslogd-lazy-graceful]
+< = jinja2-template-base
+template = {{ parameter_dict['template_caddy_lazy_script_call'] }}
+rendered = ${directory:bin}/backend-haproxy-rsyslogd-lazy-graceful
+mode = 0700
+pid-file = ${directory:run}/backend-haproxy-rsyslogd-lazy-graceful.pid
+wait_time = 60
+extra-context =
+    key pid_file :pid-file
+    key wait_time :wait_time
+    key lazy_command backend-haproxy-rsyslogd-config:graceful-command
+
 [logrotate-entry-backend-haproxy]
 <= logrotate-entry-base
 name = backend-haproxy
-log = ${backend-haproxy-rsyslogd-configuration:log-file}
-rotate-num = 30
-post = kill -HUP $(cat ${backend-haproxy-rsyslogd-configuration:pid-file})
+log = ${backend-haproxy-rsyslogd-config:log-file}
+rotate-num = ${configuration:rotate-num}
+# Note: Slaves do not define their own reload, as this would be repeated,
+#       because sharedscripts work per entry, and each slave needs its own
+#       olddir
+#       Here we trust that there will be something to be rotated with error
+#       or access log, and that this will trigger postrotate script.
+post = ${backend-haproxy-rsyslogd-lazy-graceful:rendered} &
 
 [backend-haproxy-configuration-state]
 <= jinja2-template-base
@@ -767,18 +786,6 @@ extra-context =
     key configuration_state_command backend-haproxy-configuration-state-validate:rendered
     key last_state_file :last_state_file
 
-[backend-haproxy-lazy-graceful]
-< = jinja2-template-base
-template = {{ parameter_dict['template_caddy_lazy_script_call'] }}
-rendered = ${directory:bin}/backend-haproxy-lazy-graceful
-mode = 0700
-pid-file = ${directory:run}/backend-haproxy-lazy-graceful.pid
-wait_time = 60
-extra-context =
-    key pid_file :pid-file
-    key wait_time :wait_time
-    key lazy_command backend-haproxy-configuration:graceful-command
-
 [promise-backend-haproxy-configuration]
 <= monitor-promise-base
 module = validate_frontend_configuration
@@ -796,27 +803,26 @@ content =
 context =
     key content :content
 
-[backend-haproxy-rsyslogd-configuration]
-<= jinja2-template-base
-template = {{ parameter_dict['template_rsyslogd_conf'] }}
-rendered = ${directory:etc}/backend-haproxy-rsyslogd.conf
-# Note: log-socket shall be backend-haproxy-rsyslogd.sock to refer the part name,
-#       but it results with socket path limit
+[backend-haproxy-rsyslogd-config]
 log-socket = ${directory:run}/bhlog.sck
 log-file = ${directory:log}/backend-haproxy.log
 pid-file = ${directory:run}/backend-haproxy-rsyslogd.pid
+spool-directory = ${directory:backend-haproxy-rsyslogd-spool}
+graceful-command = kill -HUP $(cat ${:pid-file})
+caddy-log-directory = ${caddy-directory:slave-log}
+
+[backend-haproxy-rsyslogd-configuration]
+<= jinja2-template-base
+template = ${software-release-path:template-backend-haproxy-rsyslogd-conf}
+rendered = ${directory:etc}/backend-haproxy-rsyslogd.conf
 extra-context =
-  key socket :log-socket
-  key log_file :log-file
-  key spool_directory directory:backend-haproxy-rsyslogd-spool
+  section configuration backend-haproxy-rsyslogd-config
 
 [backend-haproxy-rsyslogd]
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_dict['rsyslogd_executable'] }} -i ${backend-haproxy-rsyslogd-configuration:pid-file} -n -f ${backend-haproxy-rsyslogd-configuration:rendered}
+command-line = {{ parameter_dict['rsyslogd_executable'] }} -i ${backend-haproxy-rsyslogd-config:pid-file} -n -f ${backend-haproxy-rsyslogd-configuration:rendered}
 wrapper-path = ${directory:service}/backend-haproxy-rsyslogd
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
-log-socket = ${backend-haproxy-rsyslogd-configuration:log-socket}
-log-file = ${backend-haproxy-rsyslogd-configuration:log-file}
 
 #######
 # Monitoring sections

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

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

software/caddy-frontend/instance.cfg.in

@@ -123,3 +123,4 @@ configuration.backend-connect-retries = 3
 configuration.backend-haproxy-http-port = 21080
 configuration.backend-haproxy-https-port = 21443
 configuration.authenticate-to-backend = False
+configuration.rotate-num = 4000

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

@@ -33,13 +33,6 @@ context =
     raw common_profile {{ common_profile }}
     ${:extra-context}
 
-post = {{ frontend_lazy_graceful_reload }} &
-frequency = daily
-rotatep-num = 30
-sharedscripts = true
-notifempty = true
-create = true
-
 # empty sections if no slaves are available
 [slave-log-directory-dict]
 [slave-password]
@@ -119,8 +112,10 @@ create = true
 {#-   Set Up log files #}
 {%-   do slave_parameter_dict.__setitem__('access_log', '/'.join([caddy_log_directory, '%s_access_log' % slave_reference])) %}
 {%-   do slave_parameter_dict.__setitem__('error_log', '/'.join([caddy_log_directory, '%s_error_log' % slave_reference])) %}
+{%-   do slave_parameter_dict.__setitem__('backend_log', '/'.join([caddy_log_directory, '%s_backend_log' % slave_reference])) %}
 {%-   do slave_instance.__setitem__('access_log', slave_parameter_dict.get('access_log')) %}
 {%-   do slave_instance.__setitem__('error_log', slave_parameter_dict.get('error_log')) %}
+{%-   do slave_instance.__setitem__('backend_log', slave_parameter_dict.get('backend_log')) %}
 {#-   Add slave log directory to the slave log access dict #}
 {%-   do slave_log_dict.__setitem__(slave_reference, slave_log_folder) %}
 {%-   set slave_log_access_url = 'https://' + slave_reference.lower() + ':${'+ slave_password_section +':passwd}@[' + frontend_configuration.get('caddy-ipv6') + ']:' + frontend_configuration.get('caddy-https-port') + '/' + slave_reference.lower() + '/' %}
@@ -148,15 +143,17 @@ create = true
 [{{slave_logrotate_section}}]
 <= logrotate-entry-base
 name = ${:_buildout_section_name_}
-log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
+log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}} {{slave_parameter_dict.get('backend_log')}}
 backup = {{ slave_log_folder }}
+rotate-num = {{ dumps('' ~ configuration['rotate-num']) }}
 
 {#-   integrate current logs inside #}
 
 [{{slave_ln_section}}]
 recipe = plone.recipe.command
 stop-on-error = false
-command = ln -s {{slave_parameter_dict.get('error_log')}} {{ slave_log_folder }}/error.log && ln -s {{slave_parameter_dict.get('access_log')}} {{ slave_log_folder }}/access.log
+update-command = ${:command}
+command = ln -sf {{slave_parameter_dict.get('error_log')}} {{ slave_log_folder }}/error.log && ln -sf {{slave_parameter_dict.get('access_log')}} {{ slave_log_folder }}/access.log && ln -sf {{slave_parameter_dict.get('backend_log')}} {{ slave_log_folder }}/backend.log
 
 {#-   Set password for slave #}
 

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

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

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

-module(
-  load="imuxsock"
-  SysSock.Name="{{ socket }}")
-
-# Use traditional timestamp format.
-# To enable high precision timestamps, comment out the following line.
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-$FileCreateMode 0600
-$DirCreateMode 0700
-$Umask 0022
-
-$WorkDirectory {{ spool_directory }}
-
-*.* {{ log_file }}

software/caddy-frontend/test/test.py

@@ -711,6 +711,22 @@ class HttpFrontendTestCase(SlapOSInstanceTestCase):
       result.status_code,
       'While accessing %r of %r the status code was %r' % (
         url, frontend, result.status_code))
+    self.assertEqual(
+      httplib.OK,
+      requests.get(url + 'access.log', verify=False).status_code
+    )
+    self.assertEqual(
+      httplib.OK,
+      requests.get(url + 'error.log', verify=False).status_code
+    )
+    # assert only for few tests, as backend log is not available for many of
+    # them, as it's created on the fly
+    for test_name in ['test_url', 'test_auth_to_backend', 'test_compressed_result']:
+      if self.id().endswith(test_name):
+        self.assertEqual(
+          httplib.OK,
+          requests.get(url + 'backend.log', verify=False).status_code
+        )
 
   def assertKedifaKeysWithPop(self, parameter_dict, prefix=''):
     generate_auth_url = parameter_dict.pop('%skey-generate-auth-url' % (
@@ -1617,20 +1633,6 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
 
     self.assertEqual(httplib.SERVICE_UNAVAILABLE, result.status_code)
 
-    # check that log file contains verbose log
-    log_file = glob.glob(
-      os.path.join(
-        self.instance_path, '*', 'var', 'log', 'httpd', '_empty_access_log'
-      ))[0]
-
-    log_regexp = r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} - - ' \
-                 r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2} \+\d{4}\] ' \
-                 r'"GET \/test-path HTTP\/1.1" \d{3} \d+ "-" '\
-                 r'"python-requests.*" \d+'
-
-    self.assertRegexpMatches(
-      open(log_file, 'r').readlines()[-1],
-      log_regexp)
     result_http = fakeHTTPResult(
       parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
     self.assertEqual(
@@ -1729,6 +1731,39 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
       result.headers['Set-Cookie']
     )
 
+    # check access log
+    log_file = glob.glob(
+      os.path.join(
+        self.instance_path, '*', 'var', 'log', 'httpd', '_Url_access_log'
+      ))[0]
+
+    log_regexp = r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} - - ' \
+                 r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2} \+\d{4}\] ' \
+                 r'"GET \/test-path\/deep\/..\/.\/deeper HTTP\/1.1" \d{3} ' \
+                 r'\d+ "-" "python-requests.*" \d+'
+
+    self.assertRegexpMatches(
+      open(log_file, 'r').readlines()[-1],
+      log_regexp)
+
+    # check backend log
+    log_file = glob.glob(
+      os.path.join(
+        self.instance_path, '*', 'var', 'log', 'httpd', '_Url_backend_log'
+      ))[0]
+
+    log_regexp = r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+ ' \
+                 r'\[\d{2}\/.{3}\/\d{4}\:\d{2}\:\d{2}\:\d{2}.\d{3}\] ' \
+                 r'http-backend _Url-http\/backend ' \
+                 r'\d+/\d+\/\d+\/\d+\/\d+ ' \
+                 r'200 \d+ - - ---- ' \
+                 r'\d\/\d\/\d\/\d\/\d \d\/\d ' \
+                 r'"GET /test-path/deeper HTTP/1.1"'
+
+    self.assertRegexpMatches(
+      open(log_file, 'r').readlines()[-1],
+      log_regexp)
+
     result_http = fakeHTTPResult(
       parameter_dict['domain'], parameter_dict['public-ipv4'],
       'test-path/deep/.././deeper')
@@ -3668,7 +3703,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertNotEqual(via, None)
     self.assertRegexpMatches(
       via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.6\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.11\)$'
     )
 
   def test_enable_cache_server_alias(self):
@@ -3710,7 +3745,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertNotEqual(via, None)
     self.assertRegexpMatches(
       via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.6\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.11\)$'
     )
 
     result = fakeHTTPResult(
@@ -3772,7 +3807,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertNotEqual(via, None)
     self.assertRegexpMatches(
       via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.6\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.11\)$'
     )
 
     # check stale-if-error support (assumes stale-while-revalidate is same)
@@ -3824,7 +3859,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
       self.assertNotEqual(via, None)
       self.assertRegexpMatches(
         via,
-        r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.6\)$'
+        r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.11\)$'
       )
     finally:
       self.startServerProcess()
@@ -3949,7 +3984,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertNotEqual(via, None)
     self.assertRegexpMatches(
       via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.6\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.11\)$'
     )
 
     try:
@@ -3996,7 +4031,7 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
     self.assertNotEqual(via, None)
     self.assertRegexpMatches(
       via,
-      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.6\)$'
+      r'^http\/1.1 caddy-frontend-1\[.*\] \(ApacheTrafficServer\/7.1.11\)$'
     )
 
   def test_enable_http2_false(self):

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

@@ -10,12 +10,16 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

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

@@ -10,12 +10,16 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

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

@@ -10,12 +10,16 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

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

@@ -10,12 +10,16 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_dummy-cached_access_log
+T-2/var/log/httpd/_dummy-cached_backend_log
 T-2/var/log/httpd/_dummy-cached_error_log
 T-2/var/log/httpd/_enable-http2-default_access_log
+T-2/var/log/httpd/_enable-http2-default_backend_log
 T-2/var/log/httpd/_enable-http2-default_error_log
 T-2/var/log/httpd/_enable-http2-false_access_log
+T-2/var/log/httpd/_enable-http2-false_backend_log
 T-2/var/log/httpd/_enable-http2-false_error_log
 T-2/var/log/httpd/_enable-http2-true_access_log
+T-2/var/log/httpd/_enable-http2-true_backend_log
 T-2/var/log/httpd/_enable-http2-true_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

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

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

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

@@ -10,8 +10,10 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_default_ciphers_access_log
+T-2/var/log/httpd/_default_ciphers_backend_log
 T-2/var/log/httpd/_default_ciphers_error_log
 T-2/var/log/httpd/_own_ciphers_access_log
+T-2/var/log/httpd/_own_ciphers_backend_log
 T-2/var/log/httpd/_own_ciphers_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

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

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

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

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

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

@@ -10,6 +10,7 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_access_log
+T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_backend_log
 T-2/var/log/httpd/_ssl_from_master_kedifa_overrides_master_certificate_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

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

@@ -10,6 +10,7 @@ T-2/var/log/frontend-access.log
 T-2/var/log/frontend-error.log
 T-2/var/log/httpd-csr_id/expose-csr_id.log
 T-2/var/log/httpd/_ssl_from_master_access_log
+T-2/var/log/httpd/_ssl_from_master_backend_log
 T-2/var/log/httpd/_ssl_from_master_error_log
 T-2/var/log/monitor-httpd-access.log
 T-2/var/log/monitor-httpd-error.log

stack/erp5/buildout.cfg

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