From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 3 Feb 2021 22:35:53 +0000 (+0100)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7f8dd49e17f64dddf8cda18e8fe9254fc5d06425;p=config%2Fsarah%2Fetc.git

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index 5a2ba55..93fb40d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1019,6 +1019,8 @@ maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_3'
 maybe chmod 0644 'login.defs'
 maybe chmod 0644 'logrotate.conf'
 maybe chmod 0755 'logrotate.d'
+maybe chmod 0755 'logrotate.d/.from-pkg'
+maybe chmod 0755 'logrotate.d/.from-pkg/2021-02-03'
 maybe chmod 0644 'logrotate.d/alternatives'
 maybe chmod 0644 'logrotate.d/apt'
 maybe chmod 0644 'logrotate.d/aptitude'
diff --git a/logrotate.d/mysql-server b/logrotate.d/mysql-server
index 97f25f1..39370f8 100644
--- a/logrotate.d/mysql-server
+++ b/logrotate.d/mysql-server
@@ -14,9 +14,10 @@
 	sharedscripts
 	postrotate
 		test -x /usr/bin/mysqladmin || exit 0
-		if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
+		if [ -f `my_print_defaults --mysqld | grep -m 1 -oP "pid-file=\K.+$"` ]; then
 			# If this fails, check debian.conf!
-			mysqladmin --defaults-file=/etc/mysql/debian.cnf flush-logs
+			mysqladmin --defaults-file=/etc/mysql/debian.cnf --local flush-error-log \
+				flush-engine-log flush-general-log flush-slow-log
 		fi
 	endscript
 }
diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog
index e74fa83..0233a2f 100644
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -10,7 +10,7 @@
 	olddir /var/log/.old
 	sharedscripts
 	postrotate
-		invoke-rc.d rsyslog rotate > /dev/null
+		/usr/lib/rsyslog/rsyslog-rotate
 	endscript
 }
 
@@ -39,7 +39,7 @@
 	olddir /var/log/.old
 	sharedscripts
 	postrotate
-		invoke-rc.d rsyslog rotate > /dev/null
+		/usr/lib/rsyslog/rsyslog-rotate
 	endscript
 }
 
@@ -55,7 +55,7 @@
 	olddir /var/log/syslog.d/.old
 	sharedscripts
 	postrotate
-		invoke-rc.d rsyslog rotate > /dev/null
+		/usr/lib/rsyslog/rsyslog-rotate
 	endscript
 }
 
diff --git a/logrotate.d/ulogd2 b/logrotate.d/ulogd2
index c508361..c32076b 100644
--- a/logrotate.d/ulogd2
+++ b/logrotate.d/ulogd2
@@ -10,7 +10,11 @@
     size 1M
     sharedscripts
     postrotate
-        invoke-rc.d ulogd2 reload > /dev/null
+        if [ -d /run/systemd/system ] && command systemctl >/dev/null 2>&1 && systemctl is-active --quiet ulogd2.service; then
+            systemctl kill --kill-who main --signal=SIGHUP ulogd2.service
+        else
+            invoke-rc.d ulogd2 reload > /dev/null
+        fi
     endscript
 }
 
diff --git a/motd b/motd
index 81c6f71..8d05231 100644
--- a/motd
+++ b/motd
@@ -6,10 +6,8 @@ Debian GNU/Linux 10 (buster)
 |____/ \__,_|_|  \__,_|_| |_|
                              
 
-Kleine Mädchen scheinen am leichtesten gut erzogen, weil ihre Natur
-nicht heftig, sondern immer furchtsam ist und also jeden Schein der
-Erziehung leichter nachspiegelt.
-		-- Jean Paul
+Wußten Sie schon...
+... daß der Hintern zu sehen bleibt, wenn man den Kopf in den Sand steckt?
 
 Today is Prickle-Prickle, the 34th day of Chaos in the YOLD 3187