From 196797346b973d1eba3f3d000321786c54e3bdbf Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 8 Jan 2025 20:41:36 +0100
Subject: syslog: T6989: remove CLI option for user terminal logging

Should be added as runtime option similar to "terminal monitor" known from
other vendors.
---
 data/templates/rsyslog/rsyslog.conf.j2     | 13 -------------
 interface-definitions/system_syslog.xml.in | 19 -------------------
 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'])
-- 
cgit v1.2.3