Package: puppet-module-rodjek-logrotate / 1.1.1+ds1-7

handles-correctly-systemd-timer-presence.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Description: Handles correctly the presence of systemd
 The /etc/cron.daily/logrotate used to be less good than the original
 Debian package version. Let's switch back to it.
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2024-12-02

--- puppet-module-rodjek-logrotate-1.1.1+ds1.orig/files/etc/cron.daily/logrotate
+++ puppet-module-rodjek-logrotate-1.1.1+ds1/files/etc/cron.daily/logrotate
@@ -2,5 +2,19 @@
 # THIS FILE IS AUTOMATICALLY DISTRIBUTED BY PUPPET.  ANY CHANGES WILL BE
 # OVERWRITTEN.
 
-test -x /usr/sbin/logrotate || exit 0
+# skip in favour of systemd timer
+if [ -d /run/systemd/system ]; then
+	exit 0
+fi
+
+# this cronjob persists removals (but not purges)
+if [ ! -x /usr/sbin/logrotate ]; then
+	exit 0
+fi
+
 /usr/sbin/logrotate /etc/logrotate.conf
+EXITVALUE=$?
+if [ $EXITVALUE != 0 ]; then
+	/usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
+fi
+exit $EXITVALUE