From c5bfc990611dc8c28b78264aee43b8988462f923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 6 Apr 2020 14:47:58 +0200
Subject: [PATCH] software/caddy-frontend: small cleanups
The same caddy-log-access section was defined more than once, keep only
one implementation.
Remove some trailing spaces.
---
software/caddy-frontend/buildout.hash.cfg | 2 +-
.../templates/apache-custom-slave-list.cfg.in | 13 ++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg
index f463a196f..990bfacc6 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 = 46e0ccb54c2406b8a44cdada73c061a6
+md5sum = cbe0ee673bf143cd4b874167b14ad22d
[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 08817a530..2e7cc6955 100644
--- a/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
+++ b/software/caddy-frontend/templates/apache-custom-slave-list.cfg.in
@@ -154,7 +154,7 @@ create = true
<= logrotate-entry-base
name = ${:_buildout_section_name_}
log = {{slave_parameter_dict.get('access_log')}} {{slave_parameter_dict.get('error_log')}}
-backup = {{ slave_log_folder }}
+backup = {{ slave_log_folder }}
{% if enable_cache %}
[{{slave_logrotate_cache_direct_section}}]
<= logrotate-entry-base
@@ -352,15 +352,6 @@ recipe = slapos.cookbook:mkdirectory
{% 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') %}
###############################################
@@ -484,7 +475,7 @@ rendered = {{frontend_configuration.get('log-access-configuration')}}
[buildout]
extends =
{{ common_profile }}
- {{ logrotate_base_instance }}
+ {{ logrotate_base_instance }}
{{ monitor_template }}
parts +=
--
2.30.9