daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 56c381b3a9bceeec6ee27781db89e25115ff036d..3cb1c13a621abe4b0c7c1ecc56f39669ac3c1d98 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1256,6 +1256,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'
@@ -1264,7 +1266,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 5176131807714c339c0cf5cd70cdb7cf6b6b1677..2382132244923143b7a503ffce024d2aa192af2d 100644 (file)
--- 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 (file)
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 e74fa837c06d478a2bd76fc6090a787a74eea22a..0233a2fabc5aa597b718cf72633ecb74b6d6855e 100644 (file)
--- 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 ec70b2a43d9600ff70bdae655851a5ebcfc3f105..cb5fd896d33786879fdb42e2010b070aa162c141 100644 (file)
--- a/logrotate.d/ulogd2
+++ b/logrotate.d/ulogd2
@@ -1,27 +1,21 @@
-#/var/log/ulog/*.log /var/log/ulog/*.pcap {
-#    missingok
-#    compress
-#    sharedscripts
-#    create 640 ulog adm
-#    postrotate
-#      invoke-rc.d ulogd2 reload > /dev/null
-#    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