diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 916fe2947ec45f1a98d6eb889c7a5704a2124a3e..8cd43d09d0e42186cc228bbfe04c9c9e340c16ca 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -30,7 +30,7 @@ md5sum = 491a19d1747bbf795c27b094cf67114d [template-slave-list] filename = templates/apache-custom-slave-list.cfg.in -md5sum = cee327868f251639883df63923f978b5 +md5sum = 13338a7844f5a4b749f6647ba8163a8d [template-slave-configuration] filename = templates/custom-virtualhost.conf.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 42a28c6a0c6785d995dd1aa959c67bf01436e450..5a4a94a23cb8aa813edf67f86825ef33eb5e76f2 100644 --- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in +++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in @@ -77,6 +77,7 @@ output = {{ plugin_directory }}/${:name} {% set slave_publish_dict = {} %} {% set slave_configuration_section_name = 'slave-instance-%s-configuration' % slave_reference %} {% set slave_logrotate_section = slave_reference + "-logs" %} +{% set slave_logrotate_cache_direct_section = slave_reference + "-cache-direct-logs" %} {% set slave_password_section = slave_reference + "-password" %} {% set slave_ln_section = slave_reference + "-ln" %} @@ -86,7 +87,8 @@ output = {{ plugin_directory }}/${:name} {% set slave_log_folder = '${logrotate-directory:logrotate-backup}/' + slave_reference + "-logs" %} {% if enable_cache %} -{% set slave_log_cache_direct_folder = '${logrotate-directory:logrotate-backup}/' + slave_reference + "-cache-direct-logs" %} +{% set slave_log_cache_direct_folder = '${logrotate-directory:logrotate-backup}/' + slave_logrotate_cache_direct_section %} +{% do part_list.extend([slave_logrotate_cache_direct_section]) %} {% endif %} {# Pass HTTP2 switch #} @@ -162,7 +164,7 @@ name = ${:_buildout_section_name_} log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}} backup = {{ slave_log_folder }} {% if enable_cache %} -[{{slave_logrotate_section}}_cache_direct] +[{{slave_logrotate_cache_direct_section}}] <= logrotate-entry-base name = ${:_buildout_section_name_} log = {{slave_parameter_dict.get('access_log_cache_direct')}} {{slave_parameter_dict.get('error_log_cache_direct')}}