From 9bfc8237e0491469abda6e3254671c9188b6cb5e Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Mon, 31 Jul 2023 22:08:16 +0200
Subject: [PATCH] Edit Logrotate: Reduce Complexity & hard set 100M size limit
 (#4038)

* simplify logrotate and force hard size limit
* default log rotation in build sd card & 100M limit
* changing to size limit for tor logs
* changing to size limit for CLN logs
* force a log rotate on every boot
---
 build_sdcard.sh                          | 56 ++++++------------------
 home.admin/_bootstrap.sh                 |  3 ++
 home.admin/_provision_.sh                |  6 ---
 home.admin/config.scripts/cl.install.sh  |  4 +-
 home.admin/config.scripts/tor.network.sh |  4 +-
 5 files changed, 20 insertions(+), 53 deletions(-)

diff --git a/build_sdcard.sh b/build_sdcard.sh
index bcaa06b2f..dc6940356 100644
--- a/build_sdcard.sh
+++ b/build_sdcard.sh
@@ -491,55 +491,25 @@ fi
 sed -i "s/^#SystemMaxUse=.*/SystemMaxUse=250M/g" /etc/systemd/journald.conf
 sed -i "s/^#SystemMaxFileSize=.*/SystemMaxFileSize=50M/g" /etc/systemd/journald.conf
 
-# change log rotates
-# see https://github.com/rootzoll/raspiblitz/issues/394#issuecomment-471535483
+## LOG ROTATION
+
+# GLOBAL for all logs: /etc/logrotate.conf
+echo "# Optimizing log files: rotate daily max 100M, keep 4 days & compress old"
+sed -i "s/^weekly/daily size 100M/g" /etc/logrotate.conf
+sed -i "s/^#compress/compress/g" /etc/logrotate.conf
+
+# SPECIAL FOR SYSLOG: /etc/logrotate.d/rsyslog
+# to test config run: sudo logrotate -v /etc/logrotate.d/rsyslog
+rm /etc/logrotate.d/rsyslog 2>/dev/null
 echo "
 /var/log/syslog
-{
-  rotate 7
-  daily
-  missingok
-  notifempty
-  delaycompress
-  compress
-  postrotate
-    invoke-rc.d rsyslog rotate > /dev/null
-  endscript
-}
-
 /var/log/mail.info
 /var/log/mail.warn
 /var/log/mail.err
 /var/log/mail.log
 /var/log/daemon.log
-{
-  rotate 4
-  size=100M
-  missingok
-  notifempty
-  compress
-  delaycompress
-  sharedscripts
-  postrotate
-    invoke-rc.d rsyslog rotate > /dev/null
-  endscript
-}
-
 /var/log/kern.log
 /var/log/auth.log
-{
-  rotate 4
-  size=100M
-  missingok
-  notifempty
-  compress
-  delaycompress
-  sharedscripts
-  postrotate
-    invoke-rc.d rsyslog rotate > /dev/null
-  endscript
-}
-
 /var/log/user.log
 /var/log/lpr.log
 /var/log/cron.log
@@ -547,19 +517,19 @@ echo "
 /var/log/messages
 {
   rotate 4
-  weekly
+  size 100M
   missingok
-  notifempty
   compress
   delaycompress
   sharedscripts
   postrotate
-    invoke-rc.d rsyslog rotate > /dev/null
+    service logrotate restart
   endscript
 }
 " | tee ./rsyslog
 mv ./rsyslog /etc/logrotate.d/rsyslog
 chown root:root /etc/logrotate.d/rsyslog
+service logrotate restart
 service rsyslog restart
 
 echo -e "\n*** ADDING MAIN USER admin ***"
diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 24c5a5354..03ffc5148 100755
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -167,6 +167,9 @@ sleep 5
 # CLEANING BOOT SYSTEM
 ################################
 
+# force a rotation of every log on boot
+logrotate -f /etc/logrotate.d/rsyslog
+
 # Emergency cleaning logs when over 1GB (to prevent SD card filling up)
 # see https://github.com/rootzoll/raspiblitz/issues/418#issuecomment-472180944
 echo "*** Checking Log Size ***"
diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh
index 0686fcf6d..da63a0c20 100755
--- a/home.admin/_provision_.sh
+++ b/home.admin/_provision_.sh
@@ -52,12 +52,6 @@ echo "### BASIC SYSTEM SETTINGS ###" >> ${logFile}
 echo "# Make sure the user bitcoin is in the debian-tor group"
 usermod -a -G debian-tor bitcoin
 
-echo "# Optimizing log files: rotate daily, keep 1 week & compress old days " >> ${logFile}
-sed -i "s/^weekly/daily/g" /etc/logrotate.conf >> ${logFile} 2>&1
-sed -i "s/^rotate 4/rotate 7/g" /etc/logrotate.conf >> ${logFile} 2>&1
-sed -i "s/^#compress/compress/g" /etc/logrotate.conf >> ${logFile} 2>&1
-systemctl restart logrotate
-
 # make sure to have bitcoin core >=22 is backwards comp
 # see https://github.com/rootzoll/raspiblitz/issues/2546
 sed -i '/^deprecatedrpc=.*/d' /mnt/hdd/bitcoin/bitcoin.conf 2>/dev/null
diff --git a/home.admin/config.scripts/cl.install.sh b/home.admin/config.scripts/cl.install.sh
index c18d481b6..783dfb926 100644
--- a/home.admin/config.scripts/cl.install.sh
+++ b/home.admin/config.scripts/cl.install.sh
@@ -322,8 +322,8 @@ always-use-proxy=true
   echo "\
 /home/bitcoin/.lightning/${CLNETWORK}/cl.log
 {
-        rotate 5
-        daily
+        rotate 4
+        size 100M
         copytruncate
         missingok
         olddir /home/bitcoin/.lightning/${CLNETWORK}/cl.log_old
diff --git a/home.admin/config.scripts/tor.network.sh b/home.admin/config.scripts/tor.network.sh
index 40f2c3f1b..50cd0ffea 100755
--- a/home.admin/config.scripts/tor.network.sh
+++ b/home.admin/config.scripts/tor.network.sh
@@ -136,8 +136,8 @@ case "$1" in
     # add logrotate config for modified Tor dir on ext. disk
     sudo tee /etc/logrotate.d/raspiblitz-tor >/dev/null <<EOF
 /mnt/hdd/tor/*log {
-        daily
-        rotate 5
+        size 100M
+        rotate 4
         compress
         delaycompress
         missingok