summaryrefslogtreecommitdiff
path: root/src/etc
diff options
context:
space:
mode:
authorsarthurdev <965089+sarthurdev@users.noreply.github.com>2022-07-06 19:35:11 +0200
committersarthurdev <965089+sarthurdev@users.noreply.github.com>2022-07-07 10:07:55 +0200
commit52ce659509022807c4a38fcb791abd325f3e8b00 (patch)
tree0349b1bcfad1f0c52437dfef033981bffdcdd119 /src/etc
parent9b6d03061b6fcb51d874b91f6bea4bf23cdab3bf (diff)
downloadvyos-1x-52ce659509022807c4a38fcb791abd325f3e8b00.tar.gz
vyos-1x-52ce659509022807c4a38fcb791abd325f3e8b00.zip
syslog: T4500: Remove max-size from rsyslog leaving rotation to logrotate
After discussion with @zsdc this was decided the better long term fix * Removes hourly logrotate cron in favour of systemd timer override
Diffstat (limited to 'src/etc')
-rwxr-xr-xsrc/etc/cron.hourly/vyos-logrotate-hourly4
-rw-r--r--src/etc/logrotate.d/vyos-rsyslog2
-rw-r--r--src/etc/systemd/system/logrotate.timer.d/10-override.conf2
3 files changed, 3 insertions, 5 deletions
diff --git a/src/etc/cron.hourly/vyos-logrotate-hourly b/src/etc/cron.hourly/vyos-logrotate-hourly
deleted file mode 100755
index f4f56a9c2..000000000
--- a/src/etc/cron.hourly/vyos-logrotate-hourly
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-test -x /usr/sbin/logrotate || exit 0
-/usr/sbin/logrotate /etc/logrotate.conf
diff --git a/src/etc/logrotate.d/vyos-rsyslog b/src/etc/logrotate.d/vyos-rsyslog
index 28ea088e2..3c087b94e 100644
--- a/src/etc/logrotate.d/vyos-rsyslog
+++ b/src/etc/logrotate.d/vyos-rsyslog
@@ -4,7 +4,7 @@
nomail
notifempty
rotate 10
- size 262144
+ size 1M
postrotate
# inform rsyslog service about rotation
/usr/lib/rsyslog/rsyslog-rotate
diff --git a/src/etc/systemd/system/logrotate.timer.d/10-override.conf b/src/etc/systemd/system/logrotate.timer.d/10-override.conf
new file mode 100644
index 000000000..f50c2b082
--- /dev/null
+++ b/src/etc/systemd/system/logrotate.timer.d/10-override.conf
@@ -0,0 +1,2 @@
+[Timer]
+OnCalendar=hourly