diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg index df83329b5c93af48f687d3e8f7be7c67ffd4ba56..e29d62d095bf64eeba9a8454dba9d285a9bb0de7 100644 --- a/software/caddy-frontend/buildout.hash.cfg +++ b/software/caddy-frontend/buildout.hash.cfg @@ -30,7 +30,7 @@ md5sum = ef06c04a5aa33b103dc1d25d0dfe8217 [template-slave-list] filename = templates/apache-custom-slave-list.cfg.in -md5sum = a473ded24aed999abed3d79a08bb09a6 +md5sum = 0dc409d7d3226a6727ec340ebf79f8da [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 caea65bc0b2e1aa175969de5d392de216a543dc0..e038f7795aa6c733f79dc690126cc6b623fd7412 100644 --- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in +++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in @@ -125,22 +125,6 @@ output = {{ plugin_directory }}/${:name} [slave-log-directory-dict] {{slave_reference}} = {{ slave_log_folder }} -[slave-log-directories] -<= slave-log-directory-dict -recipe = slapos.cookbook:mkdirectory - -{% do part_list.append('slave-log-directories') %} - -[caddy-log-access] -< = jinja2-template-base -template = {{frontend_configuration.get('template-log-access')}} -rendered = {{frontend_configuration.get('log-access-configuration')}} -extra-context = - section slave_log_directory slave-log-directory-dict - section slave_password slave-password - section parameter_dict caddy-log-access-parameters - -{% do part_list.append('caddy-log-access') %} [slave-password] {{ slave_reference }} = {{ '${' + slave_password_section + ':passwd}' }} @@ -350,6 +334,23 @@ recipe = slapos.cookbook:publish {# End of the main for loop#} {% endfor %} +[slave-log-directories] +<= slave-log-directory-dict +recipe = slapos.cookbook:mkdirectory + +{% do part_list.append('slave-log-directories') %} + +[caddy-log-access] +< = jinja2-template-base +template = {{frontend_configuration.get('template-log-access')}} +rendered = {{frontend_configuration.get('log-access-configuration')}} +extra-context = + section slave_log_directory slave-log-directory-dict + section slave_password slave-password + section parameter_dict caddy-log-access-parameters + +{% do part_list.append('caddy-log-access') %} + ############################################### ### Prepare virtualhost for slaves using cache