From 4e4d8b57b21f57cb60fcdfe63cbb99ecc52a5bff Mon Sep 17 00:00:00 2001
From: Charlie Root <root@cfm.planix.org>
Date: Thu, 7 Dec 2023 13:05:56 +0100
Subject: [PATCH] Adjujstments for logrotate

---
 templates/httpd-vhost.conf.mustache       | 5 +++++
 templates/httpd-weblogrot-matomo.mustache | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/templates/httpd-vhost.conf.mustache b/templates/httpd-vhost.conf.mustache
index b2bd292..bb33658 100644
--- a/templates/httpd-vhost.conf.mustache
+++ b/templates/httpd-vhost.conf.mustache
@@ -23,8 +23,10 @@
 	RewriteRule "^/.well-known/acme-challenge/" - [L]
 	DocumentRoot "{{vars.apache_vhost.site.doc_root}}"
 	ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
+	{{#vars.apache_vhost.site.logging80}}
 	ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
 	CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
+	{{/vars.apache_vhost.site.logging80}}
 	{{vars.apache_vhost.site.raw}}
 </VirtualHost>
 {{/vars.apache_vhost.site.ssl}}
@@ -44,8 +46,11 @@
 	DocumentRoot "{{vars.apache_vhost.site.doc_root}}"
 	ServerName {{vars.apache_vhost.site.domain}}
 	ServerAlias {{#vars.apache_vhost.site.aliases}}{{.}} {{/vars.apache_vhost.site.aliases}}
+
+	{{#vars.apache_vhost.site.logging443}}
 	ErrorLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-error.log"
 	CustomLog "{{vars.apache.log_dir}}/{{vars.apache_vhost.site.domain}}-access.log" combined
+	{{/vars.apache_vhost.site.logging443}}
 	# SSL
 	SSLEngine on
 #	SSLCertificateFile {{vars.certbot.certbot_dir}}/live/{{vars.apache_vhost.site.domain}}/fullchain.pem
diff --git a/templates/httpd-weblogrot-matomo.mustache b/templates/httpd-weblogrot-matomo.mustache
index ecad54d..eaf526f 100644
--- a/templates/httpd-weblogrot-matomo.mustache
+++ b/templates/httpd-weblogrot-matomo.mustache
@@ -1,6 +1,6 @@
 {{vars.apache.log_dir}}/{{vars.apache_matomo.site.domain}}-access.log {
-	rotate 100
-	size 1024k
+	rotate 30
+	size 100k
 
 	postrotate
 	service {{vars.apache.service_name}} restart ; {{{vars.apache_matomo.logger_script}}}  
@@ -8,7 +8,7 @@
 }
 
 {{vars.apache.log_dir}}/{{vars.apache_matomo.site.domain}}-error.log {
-	rotate 100
+	rotate 30
 	size 100k
 
 	postrotate