diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 7018b07ec99f9e8bad5c4296f2f60d39fa51a1e5..e9b20584719c14fda82f66e4838adfc4dcb8337c 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -30,7 +30,7 @@ md5sum = 1576859772052bcb85ff2b5a7b786410 [template-slave-list] filename = templates/apache-custom-slave-list.cfg.in -md5sum = ed1c086f0548a908661b294e845dc008 +md5sum = a244336f20094c632076d30e4ace2254 [template-slave-configuration] filename = templates/custom-virtualhost.conf.in @@ -46,7 +46,7 @@ md5sum = 7c987ad75fcce6f5b925c7696ff41971 [template-custom-slave-list] filename = templates/apache-custom-slave-list.cfg.in -md5sum = ed1c086f0548a908661b294e845dc008 +md5sum = a244336f20094c632076d30e4ace2254 [caddy-backend-url-validator] filename = templates/caddy-backend-url-validator.in diff --git a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in index 768368a1907bdb1668a6316e98e660dcd9d25e41..30091c545472beaba1fc565205d84fb12a86c6ab 100644 --- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in +++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in @@ -62,6 +62,9 @@ crl = {{ custom_ssl_directory }}/crl/ {% set slave_log_folder = logrotate_dict.get('backup') + '/' + slave_reference + "-logs" %} +{# Pass HTTP2 switch #} +{% do slave_instance.__setitem__('enable_http2_by_default', enable_http2_by_default) %} + {# 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])) %} @@ -160,7 +163,6 @@ value = {{ dumps(slave_instance.get(cert_name)) }} {% do slave_instance.__setitem__('login_certificate', login_certificate) %} {% do slave_instance.__setitem__('login_key', login_key) %} {% do slave_instance.__setitem__('login_ca_crt', login_ca_crt) %} -{% do slave_instance.__setitem__('enable_http2_by_default', enable_http2_by_default) %} {% do slave_parameter_dict.__setitem__('ssl_crt', login_certificate) %} {% do slave_parameter_dict.__setitem__('ssl_key', login_key) %} {% if 'ssl_key' in slave_instance and 'ssl_crt' in slave_instance %}