diff options
| author | hagbard <vyosdev@derith.de> | 2019-12-05 08:06:29 -0800 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-12-05 08:06:29 -0800 |
| commit | c9390e9f1522cf5208dcdce59f2913639ab7fd6d (patch) | |
| tree | c63b7863f07eb96d59c57a3326ff4504fbf01901 /interface-definitions | |
| parent | 470fc2fd021403e350e655e56742aae59fd6b6a1 (diff) | |
| download | vyos-1x-c9390e9f1522cf5208dcdce59f2913639ab7fd6d.tar.gz vyos-1x-c9390e9f1522cf5208dcdce59f2913639ab7fd6d.zip | |
Revert "syslog: T1845: syslog host no longer accepts a port"
This reverts commit a93a1dbd7d18ff82246b4f7fb9a3757c14e6a9c7.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/syslog.xml (renamed from interface-definitions/system-syslog.xml) | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/interface-definitions/system-syslog.xml b/interface-definitions/syslog.xml index 504efd8fd..d5ea4511e 100644 --- a/interface-definitions/system-syslog.xml +++ b/interface-definitions/syslog.xml @@ -2,7 +2,7 @@ <interfaceDefinition> <node name="system"> <children> - <node name="syslog" owner="${vyos_conf_scripts_dir}/system-syslog.py"> + <node name="syslog" owner="${vyos_conf_scripts_dir}/syslog.py"> <properties> <help>System logging</help> <priority>400</priority> @@ -191,39 +191,6 @@ </valueHelp> </properties> <children> - <leafNode name="protocol"> - <properties> - <help>Syslog communication protocol</help> - <valueHelp> - <format>udp</format> - <description>Send log messages to remote syslog server over udp</description> - </valueHelp> - <valueHelp> - <format>tcp</format> - <description>Send log messages to remote syslog server over tcp</description> - </valueHelp> - <completionHelp> - <list>udp tcp</list> - </completionHelp> - <constraint> - <regex>(udp|tcp)</regex> - </constraint> - <constraintErrorMessage>Invalid protocol name</constraintErrorMessage> - </properties> - </leafNode> - <leafNode name="port"> - <properties> - <help>Destination port</help> - <valueHelp> - <format>1-65535</format> - <description>Protocol destination port</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-65535"/> - </constraint> - <constraintErrorMessage>Invalid destination port</constraintErrorMessage> - </properties> - </leafNode> <tagNode name="facility"> <properties> <help>Facility for logging</help> @@ -328,6 +295,26 @@ </valueHelp> </properties> <children> + <leafNode name="protocol"> + <properties> + <help>syslog communication protocol</help> + <valueHelp> + <format>udp</format> + <description>send log messages to remote syslog server over udp</description> + </valueHelp> + <valueHelp> + <format>tcp</format> + <description>send log messages to remote syslog server over tcp</description> + </valueHelp> + <completionHelp> + <list>udp tcp</list> + </completionHelp> + <constraint> + <regex>(udp|tcp)</regex> + </constraint> + <constraintErrorMessage>invalid protocol name</constraintErrorMessage> + </properties> + </leafNode> <leafNode name="level"> <properties> <help>Logging level</help> |