Merge remote-tracking branch 'origin/master' into t

c22b5b1d · Kirill Smelkov · ade306fd · 34ebf8b5 · c22b5b1d · c22b5b1d
Commit c22b5b1d authored Oct 14, 2020 by Kirill Smelkov
32 changed files
--- a/software/apache-frontend/README.apache_frontend.rst
+++ b/software/apache-frontend/README.apache_frontend.rst
--- a/software/apache-frontend/TODO.rst
+++ b/software/apache-frontend/TODO.rst
--- a/software/apache-frontend/buildout.hash.cfg
+++ b/software/apache-frontend/buildout.hash.cfg
--- a/software/apache-frontend/common.cfg
+++ b/software/apache-frontend/common.cfg
--- a/software/apache-frontend/development.cfg
+++ b/software/apache-frontend/development.cfg
--- a/software/apache-frontend/instance-apache-frontend.cfg
+++ b/software/apache-frontend/instance-apache-frontend.cfg
--- a/software/apache-frontend/instance-apache-input-schema.json
+++ b/software/apache-frontend/instance-apache-input-schema.json
--- a/software/apache-frontend/instance-apache-replicate.cfg.in
+++ b/software/apache-frontend/instance-apache-replicate.cfg.in
--- a/software/apache-frontend/instance-output-schema.json
+++ b/software/apache-frontend/instance-output-schema.json
--- a/software/apache-frontend/instance-slave-apache-input-schema.json
+++ b/software/apache-frontend/instance-slave-apache-input-schema.json
--- a/software/apache-frontend/instance-slave-output-schema.json
+++ b/software/apache-frontend/instance-slave-output-schema.json
--- a/software/apache-frontend/instance.cfg
+++ b/software/apache-frontend/instance.cfg
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
--- a/software/apache-frontend/software.cfg.json
+++ b/software/apache-frontend/software.cfg.json
--- a/software/apache-frontend/templates/000.conf.in
+++ b/software/apache-frontend/templates/000.conf.in
--- a/software/apache-frontend/templates/apache-custom-slave-list.cfg.in
+++ b/software/apache-frontend/templates/apache-custom-slave-list.cfg.in
--- a/software/apache-frontend/templates/apache-graceful-script.sh.in
+++ b/software/apache-frontend/templates/apache-graceful-script.sh.in
--- a/software/apache-frontend/templates/apache-lazy-script-call.sh.in
+++ b/software/apache-frontend/templates/apache-lazy-script-call.sh.in
--- a/software/apache-frontend/templates/apache.conf.in
+++ b/software/apache-frontend/templates/apache.conf.in
--- a/software/apache-frontend/templates/cached-virtualhost.conf.in
+++ b/software/apache-frontend/templates/cached-virtualhost.conf.in
--- a/software/apache-frontend/templates/custom-virtualhost.conf.in
+++ b/software/apache-frontend/templates/custom-virtualhost.conf.in
--- a/software/apache-frontend/templates/default-virtualhost.conf.in
+++ b/software/apache-frontend/templates/default-virtualhost.conf.in
--- a/software/apache-frontend/templates/empty.in
+++ b/software/apache-frontend/templates/empty.in
--- a/software/apache-frontend/templates/nginx-eventsource-slave.conf.in
+++ b/software/apache-frontend/templates/nginx-eventsource-slave.conf.in
--- a/software/apache-frontend/templates/nginx-notebook-slave.conf.in
+++ b/software/apache-frontend/templates/nginx-notebook-slave.conf.in
--- a/software/apache-frontend/templates/nginx.cfg.in
+++ b/software/apache-frontend/templates/nginx.cfg.in
--- a/software/apache-frontend/templates/notfound.html
+++ b/software/apache-frontend/templates/notfound.html
--- a/software/apache-frontend/templates/replicate-publish-slave-information.cfg.in
+++ b/software/apache-frontend/templates/replicate-publish-slave-information.cfg.in
--- a/software/apache-frontend/templates/template-log-access.conf.in
+++ b/software/apache-frontend/templates/template-log-access.conf.in
--- a/software/apache-frontend/templates/trafficserver/records.config.jinja2
+++ b/software/apache-frontend/templates/trafficserver/records.config.jinja2
--- a/software/apache-frontend/templates/trafficserver/storage.config.jinja2
+++ b/software/apache-frontend/templates/trafficserver/storage.config.jinja2
--- a/software/apache-frontend/templates/wrapper.in
+++ b/software/apache-frontend/templates/wrapper.in