diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index 990bfacc662f4de4ada689b0cded58376600e827..80e8f9f95a71ae846a0a345f14bdc2df98b9fc13 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -30,7 +30,7 @@ md5sum = 087bd9404cd120bd7602a9fbfcddc064 [template-slave-list] filename = templates/apache-custom-slave-list.cfg.in -md5sum = cbe0ee673bf143cd4b874167b14ad22d +md5sum = 29a61267959cc9ba7cdcd96fef41641a [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 2e7cc6955801355852331f7c1d7682b56e607f2e..23efc11ca8815693536eb515662066d6129f0e5d 100644 --- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in +++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in @@ -465,11 +465,11 @@ template = inline: rendered = ${:file} -[caddy-log-access-header] +[caddy-log-access-empty] # Caddy refuse to start if an `import`ed file is empty, so we prepend a header # so that the file is never empty. < = jinja2-template-base -template = inline: # This file contain directives to serve directories with log files +template = inline: # This file contain directives to serve directories with log files for shared instances, but no shared instances are defined yet. rendered = {{frontend_configuration.get('log-access-configuration')}} [buildout] @@ -481,10 +481,12 @@ extends = parts += kedifa-updater kedifa-updater-run - caddy-log-access-header {% for part in part_list %} {{ ' %s' % part }} {% endfor %} +{% if 'caddy-log-access' not in part_list %} + caddy-log-access-empty +{% endif %} publish-caddy-information tunnel-6to4-base-http_port tunnel-6to4-base-https_port