From 39b2282373c15534212ba237e6c8a3cd0be6b0aa Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Sun, 31 Oct 2021 09:44:35 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 logrotate.d/iredapd               | 12 ++++--------
 rsyslog.d/1-iredmail-iredapd.conf |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/logrotate.d/iredapd b/logrotate.d/iredapd
index 257952e..feb2cf8 100644
--- a/logrotate.d/iredapd
+++ b/logrotate.d/iredapd
@@ -1,17 +1,13 @@
 /var/log/iredapd/*.log {
-    daily
-    rotate 10
+    rotate 20
+    weekly
     missingok
+    notifempty
     compress
     delaycompress
-    notifempty
-    minsize 4M
-    olddir /var/log/iredapd/.old
     sharedscripts
 
     postrotate
-        
+        /sbin/service rsyslog restart
     endscript
 }
-
-# vim: ts=4 filetype=conf noet
diff --git a/rsyslog.d/1-iredmail-iredapd.conf b/rsyslog.d/1-iredmail-iredapd.conf
index cc50066..54ace50 100644
--- a/rsyslog.d/1-iredmail-iredapd.conf
+++ b/rsyslog.d/1-iredmail-iredapd.conf
@@ -3,10 +3,10 @@
 # Notes:
 #
 #   - $syslogfacility-text must be same as value of parameter SYSLOG_FACILITY
-#     in iredapd config file. Defaults to 'local5' (defined in
+#     in mlmmjadmin config file. Defaults to 'local5' (defined in
 #     libs/default_settings.py).
 #
 #   - Directory /var/log/iredapd/ must be owned by syslog daemon user/group.
 #
-if $syslogfacility-text == 'local5' and ($syslogtag startswith 'iredapd' or $msg startswith 'iredapd') then -/var/log/iredapd/iredapd.log
+if $syslogfacility-text == 'local5' and ($syslogtag startswith 'iredapd' or $msg startswith 'iredapd ') then -/var/log/iredapd/iredapd.log
 & stop
-- 
2.39.5