From 5e4ac6c8c15dc8bd8b68fcc76ea0ac26f5ea0936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Tue, 15 Sep 2020 09:58:45 +0200
Subject: [PATCH] fixup "caddy-frontend: Expose logs using real frontend"

By copy paste mistake wrong log files were configured for log rotation,
resulting with damaging logrotate for the whole partition.
---
 software/caddy-frontend/buildout.hash.cfg               | 2 +-
 software/caddy-frontend/instance-apache-frontend.cfg.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/software/caddy-frontend/buildout.hash.cfg b/software/caddy-frontend/buildout.hash.cfg
index 78c22f13c..b59663195 100644
--- a/software/caddy-frontend/buildout.hash.cfg
+++ b/software/caddy-frontend/buildout.hash.cfg
@@ -22,7 +22,7 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = 9a8064a771de806e7cbddac067957ea9
+md5sum = 1709085d62f46b22cbe9369fe324bb49
 
 [template-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
diff --git a/software/caddy-frontend/instance-apache-frontend.cfg.in b/software/caddy-frontend/instance-apache-frontend.cfg.in
index 6e959af34..bd1c6bb35 100644
--- a/software/caddy-frontend/instance-apache-frontend.cfg.in
+++ b/software/caddy-frontend/instance-apache-frontend.cfg.in
@@ -1000,7 +1000,7 @@ config-port = ${frontend-configuration:slave-introspection-https-port}
 [logrotate-entry-slave-introspection]
 <= logrotate-entry-base
 name = slave-introspection
-log = ${backend-haproxy-rsyslogd-config:log-file}
+log = ${caddy-configuration:slave-introspection-access-log} ${caddy-configuration:slave-introspection-error-log}
 rotate-num = ${configuration:rotate-num}
 post = kill -USR1 $(cat ${caddy-configuration:slave-introspection-pid-file})
 
-- 
2.30.9