diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-07-06 19:35:11 +0200 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2022-07-07 10:07:55 +0200 |
| commit | 52ce659509022807c4a38fcb791abd325f3e8b00 (patch) | |
| tree | 0349b1bcfad1f0c52437dfef033981bffdcdd119 /data/templates/syslog | |
| parent | 9b6d03061b6fcb51d874b91f6bea4bf23cdab3bf (diff) | |
| download | vyos-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 'data/templates/syslog')
| -rw-r--r-- | data/templates/syslog/rsyslog.conf.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/templates/syslog/rsyslog.conf.j2 b/data/templates/syslog/rsyslog.conf.j2 index 4445d568b..abe880283 100644 --- a/data/templates/syslog/rsyslog.conf.j2 +++ b/data/templates/syslog/rsyslog.conf.j2 @@ -10,7 +10,11 @@ $MarkMessagePeriod {{ files['global']['marker-interval'] }} $PreserveFQDN on {% endif %} {% for file, file_options in files.items() %} +{% if file_options['max-size'] is vyos_defined %} $outchannel {{ file }},{{ file_options['log-file'] }},{{ file_options['max-size'] }},{{ file_options['action-on-max-size'] }} +{% else %} +$outchannel {{ file }},{{ file_options['log-file'] }} +{% endif %} {{ file_options['selectors'] }} :omfile:${{ file }} {% endfor %} {% if console is defined and console is not none %} |