summaryrefslogtreecommitdiff
path: root/src/etc
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-07-07 11:43:40 +0200
committerGitHub <noreply@github.com>2022-07-07 11:43:40 +0200
commitf5e66a451dcd1d98be32e0a7800277cf81441e3d (patch)
tree0349b1bcfad1f0c52437dfef033981bffdcdd119 /src/etc
parent46f72030cdf073a69871496ae600c2d2951d808b (diff)
parent52ce659509022807c4a38fcb791abd325f3e8b00 (diff)
downloadvyos-1x-f5e66a451dcd1d98be32e0a7800277cf81441e3d.tar.gz
vyos-1x-f5e66a451dcd1d98be32e0a7800277cf81441e3d.zip
Merge pull request #1399 from sarthurdev/T4500
syslog: T4500: Remove max-size from rsyslog leaving rotation to logrotate
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