diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-02-17 16:35:23 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-02-17 16:37:33 +0100 |
| commit | 95bd2ebdcb30246d1f585ccb0336b3f3aa5519c7 (patch) | |
| tree | eff9b10fff03dcdf4c149b7c68e48a690c12e5b3 | |
| parent | 33752c9a41f2e79c1ef3884188968d0f48bc79d8 (diff) | |
| download | vyos-1x-95bd2ebdcb30246d1f585ccb0336b3f3aa5519c7.tar.gz vyos-1x-95bd2ebdcb30246d1f585ccb0336b3f3aa5519c7.zip | |
syslog: T8272: remove dead code from previous "file" logging support
Commit 395e3cb72 ("syslog: T6989: remove 'file' logging destination") removed
CLI support for custom file based logging targets. The code about logrotate
was not removed and just stayed "dead".
Dead code is removed by this commit.
| -rw-r--r-- | data/templates/rsyslog/logrotate.j2 | 13 | ||||
| -rwxr-xr-x | src/conf_mode/system_syslog.py | 4 |
2 files changed, 0 insertions, 17 deletions
diff --git a/data/templates/rsyslog/logrotate.j2 b/data/templates/rsyslog/logrotate.j2 deleted file mode 100644 index 4434a3a32..000000000 --- a/data/templates/rsyslog/logrotate.j2 +++ /dev/null @@ -1,13 +0,0 @@ -### Autogenerated by system_syslog.py ### -{% if file is vyos_defined %} -{% for file_name, file_options in file.items() %} -/var/log/user/{{ file_name }} { - missingok - notifempty - create - rotate {{ file_options.archive.file }} - size={{ file_options.archive.size | int // 1024 }}k -} - -{% endfor %} -{% endif %} diff --git a/src/conf_mode/system_syslog.py b/src/conf_mode/system_syslog.py index 7e5b4f90c..e762efd3b 100755 --- a/src/conf_mode/system_syslog.py +++ b/src/conf_mode/system_syslog.py @@ -40,7 +40,6 @@ airbag.enable() cert_dir = '/etc/rsyslog.d/certs' rsyslog_conf = '/run/rsyslog/rsyslog.conf' -logrotate_user_conf = '/etc/logrotate.d/vyos-rsyslog-user' logrotate_messages_conf = '/etc/logrotate.d/vyos-rsyslog' systemd_socket = 'syslog.socket' @@ -202,8 +201,6 @@ def generate(syslog): if not syslog: if os.path.exists(rsyslog_conf): os.unlink(rsyslog_conf) - if os.path.exists(logrotate_user_conf): - os.unlink(logrotate_user_conf) return None @@ -213,7 +210,6 @@ def generate(syslog): _save_tls_certificates_for_remote(syslog, remote_options) render(rsyslog_conf, 'rsyslog/rsyslog.conf.j2', syslog) - render(logrotate_user_conf, 'rsyslog/logrotate.j2', syslog) return None def apply(syslog): |