From 52ce659509022807c4a38fcb791abd325f3e8b00 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Wed, 6 Jul 2022 19:35:11 +0200
Subject: 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
---
 src/etc/cron.hourly/vyos-logrotate-hourly                 | 4 ----
 src/etc/logrotate.d/vyos-rsyslog                          | 2 +-
 src/etc/systemd/system/logrotate.timer.d/10-override.conf | 2 ++
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100755 src/etc/cron.hourly/vyos-logrotate-hourly
 create mode 100644 src/etc/systemd/system/logrotate.timer.d/10-override.conf

(limited to 'src/etc')

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
-- 
cgit v1.2.3