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

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index ae07754..587fb82 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -1193,6 +1193,8 @@ maybe chmod 0644 'logcheck/ignore.d.server/rsyslog'
 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/apache2'
 maybe chmod 0644 'logrotate.d/apt'
@@ -1201,7 +1203,6 @@ maybe chmod 0644 'logrotate.d/bind'
 maybe chmod 0644 'logrotate.d/btmp'
 maybe chmod 0644 'logrotate.d/certbot'
 maybe chmod 0644 'logrotate.d/chrony'
-maybe chmod 0644 'logrotate.d/chrony.dpkg-dist'
 maybe chmod 0644 'logrotate.d/dpkg'
 maybe chmod 0644 'logrotate.d/fail2ban'
 maybe chmod 0644 'logrotate.d/icinga2'
diff --git a/logrotate.d/apache2 b/logrotate.d/apache2
index 5176131..2382132 100644
--- a/logrotate.d/apache2
+++ b/logrotate.d/apache2
@@ -10,8 +10,8 @@
 	create 640 root adm
 	sharedscripts
 	postrotate
-		if /etc/init.d/apache2 status > /dev/null ; then \
-			/etc/init.d/apache2 reload > /dev/null; \
+		if invoke-rc.d apache2 status > /dev/null 2>&1; then \
+			invoke-rc.d apache2 reload > /dev/null 2>&1; \
 		fi;
 	endscript
 	prerotate
diff --git a/logrotate.d/chrony.dpkg-dist b/logrotate.d/chrony.dpkg-dist
deleted file mode 100644
index 2823a1a..0000000
--- a/logrotate.d/chrony.dpkg-dist
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/chrony/*.log {
-    missingok
-    nocreate
-    sharedscripts
-    postrotate
-        /usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true
-    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 ec70b2a..0649f96 100644
--- a/logrotate.d/ulogd2
+++ b/logrotate.d/ulogd2
@@ -4,24 +4,32 @@
 #    sharedscripts
 #    create 640 ulog adm
 #    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
 #}
 
-/var/log/ulog/*.log {
-    weekly
+/var/log/ulog/*.log /var/log/ulog/*.pcap {
+	weekly
 	dateext
-    rotate 20
-    size 4M
-    compress
-    delaycompress
-    missingok
-    notifempty
-    create 0640 ulog adm
-    sharedscripts
-    postrotate
-        invoke-rc.d ulogd2 reload > /dev/null
-    endscript
+	rotate 20
+	size 4M
+	compress
+	delaycompress
+	missingok
+	notifempty
+	create 0640 ulog adm
+	sharedscripts
+	postrotate
+	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
 }
 
 # vim: ts=4 filetype=conf