summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2025-01-15 20:38:43 +0100
committerChristian Breunig <christian@breunig.cc>2025-02-03 07:16:07 +0100
commit20ab585a68982c4635c4e5a1ee5bbcc219feaebc (patch)
tree362ae42924447bbd6f3f73493be21fea60be8bb3 /interface-definitions
parent04d296a3446fa8488add17ce1ec7931d43c4a4d0 (diff)
downloadvyos-1x-20ab585a68982c4635c4e5a1ee5bbcc219feaebc.tar.gz
vyos-1x-20ab585a68982c4635c4e5a1ee5bbcc219feaebc.zip
syslog: T6989: move up "global preserve-fqdn" one level in CLI
Move "global preserve-fqdn" one CLI level up, as it relates to all logging targets (console, global and remote).
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/system_syslog.xml.in24
1 files changed, 12 insertions, 12 deletions
diff --git a/interface-definitions/system_syslog.xml.in b/interface-definitions/system_syslog.xml.in
index f47a95f09..09cfd3dd4 100644
--- a/interface-definitions/system_syslog.xml.in
+++ b/interface-definitions/system_syslog.xml.in
@@ -8,6 +8,14 @@
<priority>400</priority>
</properties>
<children>
+ <node name="console">
+ <properties>
+ <help>Log to system console (/dev/console)</help>
+ </properties>
+ <children>
+ #include <include/syslog-facility.xml.i>
+ </children>
+ </node>
<tagNode name="remote">
<properties>
<help>Log to remote host</help>
@@ -84,22 +92,14 @@
</leafNode>
</children>
</node>
- <leafNode name="preserve-fqdn">
- <properties>
- <help>uses FQDN for logging</help>
- <valueless/>
- </properties>
- </leafNode>
</children>
</node>
- <node name="console">
+ <leafNode name="preserve-fqdn">
<properties>
- <help>Log to system console (/dev/console)</help>
+ <help>Always include domain portion in hostname</help>
+ <valueless/>
</properties>
- <children>
- #include <include/syslog-facility.xml.i>
- </children>
- </node>
+ </leafNode>
#include <include/source-address-ipv4-ipv6.xml.i>
#include <include/interface/vrf.xml.i>
</children>