diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-08 20:41:36 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-02-03 07:16:07 +0100 |
| commit | 196797346b973d1eba3f3d000321786c54e3bdbf (patch) | |
| tree | 55dcbf4eb4965ddb0182e7c77cc5af3523440e91 | |
| parent | 395e3cb72c521ea9d62c0efd1620e679fc709cda (diff) | |
| download | vyos-1x-196797346b973d1eba3f3d000321786c54e3bdbf.tar.gz vyos-1x-196797346b973d1eba3f3d000321786c54e3bdbf.zip | |
syslog: T6989: remove CLI option for user terminal logging
Should be added as runtime option similar to "terminal monitor" known from
other vendors.
| -rw-r--r-- | data/templates/rsyslog/rsyslog.conf.j2 | 13 | ||||
| -rw-r--r-- | interface-definitions/system_syslog.xml.in | 19 | ||||
| -rw-r--r-- | src/migration-scripts/system/28-to-29 | 3 |
3 files changed, 3 insertions, 32 deletions
diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2 index 67c062ab9..21bfbf822 100644 --- a/data/templates/rsyslog/rsyslog.conf.j2 +++ b/data/templates/rsyslog/rsyslog.conf.j2 @@ -49,16 +49,3 @@ $outchannel global,/var/log/messages,262144,/usr/sbin/logrotate {{ logrotate }} {% endif %} {% endfor %} {% endif %} - -{% if user is defined and user is not none %} -# Log to user terminal -{% for username, user_options in user.items() %} -{% set tmp = [] %} -{% if user_options.facility is vyos_defined %} -{% for facility, facility_options in user_options.facility.items() %} -{% set _ = tmp.append(facility.replace('all', '*') + '.' + facility_options.level.replace('all', '*')) %} -{% endfor %} -{% endif %} -{{ tmp | join(';') }} :omusrmsg:{{ username }} -{% endfor %} -{% endif %} diff --git a/interface-definitions/system_syslog.xml.in b/interface-definitions/system_syslog.xml.in index 1d5b3635f..df9536c3b 100644 --- a/interface-definitions/system_syslog.xml.in +++ b/interface-definitions/system_syslog.xml.in @@ -8,25 +8,6 @@ <priority>400</priority> </properties> <children> - <tagNode name="user"> - <properties> - <help>Logging to specific terminal of given user</help> - <completionHelp> - <path>system login user</path> - </completionHelp> - <valueHelp> - <format>txt</format> - <description>Local user account</description> - </valueHelp> - <constraint> - #include <include/constraint/login-username.xml.i> - </constraint> - <constraintErrorMessage>illegal characters in user</constraintErrorMessage> - </properties> - <children> - #include <include/syslog-facility.xml.i> - </children> - </tagNode> <tagNode name="host"> <properties> <help>Logging to remote host</help> diff --git a/src/migration-scripts/system/28-to-29 b/src/migration-scripts/system/28-to-29 index e12063fc4..b8439100a 100644 --- a/src/migration-scripts/system/28-to-29 +++ b/src/migration-scripts/system/28-to-29 @@ -27,3 +27,6 @@ def migrate(config: ConfigTree) -> None: if config.exists(base + ['file']): config.delete(base + ['file']) + + if config.exists(base + ['user']): + config.delete(base + ['user']) |