Commit c5bfc990 authored by Jérome Perrin's avatar Jérome Perrin

software/caddy-frontend: small cleanups

The same caddy-log-access section was defined more than once, keep only
one implementation.
Remove some trailing spaces.
parent 6854618a
...@@ -30,7 +30,7 @@ md5sum = 087bd9404cd120bd7602a9fbfcddc064 ...@@ -30,7 +30,7 @@ md5sum = 087bd9404cd120bd7602a9fbfcddc064
[template-slave-list] [template-slave-list]
filename = templates/apache-custom-slave-list.cfg.in filename = templates/apache-custom-slave-list.cfg.in
md5sum = 46e0ccb54c2406b8a44cdada73c061a6 md5sum = cbe0ee673bf143cd4b874167b14ad22d
[template-slave-configuration] [template-slave-configuration]
filename = templates/custom-virtualhost.conf.in filename = templates/custom-virtualhost.conf.in
......
...@@ -154,7 +154,7 @@ create = true ...@@ -154,7 +154,7 @@ create = true
<= logrotate-entry-base <= logrotate-entry-base
name = ${:_buildout_section_name_} name = ${:_buildout_section_name_}
log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}} log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
backup = {{ slave_log_folder }} backup = {{ slave_log_folder }}
{% if enable_cache %} {% if enable_cache %}
[{{slave_logrotate_cache_direct_section}}] [{{slave_logrotate_cache_direct_section}}]
<= logrotate-entry-base <= logrotate-entry-base
...@@ -352,15 +352,6 @@ recipe = slapos.cookbook:mkdirectory ...@@ -352,15 +352,6 @@ recipe = slapos.cookbook:mkdirectory
{% do part_list.append('slave-log-cache-direct-directories') %} {% do part_list.append('slave-log-cache-direct-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') %} {% do part_list.append('caddy-log-access') %}
############################################### ###############################################
...@@ -484,7 +475,7 @@ rendered = {{frontend_configuration.get('log-access-configuration')}} ...@@ -484,7 +475,7 @@ rendered = {{frontend_configuration.get('log-access-configuration')}}
[buildout] [buildout]
extends = extends =
{{ common_profile }} {{ common_profile }}
{{ logrotate_base_instance }} {{ logrotate_base_instance }}
{{ monitor_template }} {{ monitor_template }}
parts += parts +=
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment