diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-06 21:07:46 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-06 21:07:46 +0100 |
| commit | bebd084651b50171e696af232a9c403f69ac6230 (patch) | |
| tree | 6fc3a74465c94f1536d77fd3fc0f0dcc9cf47148 /interface-definitions | |
| parent | a96ffc33cc63918ba3815f66c506c717a8676621 (diff) | |
| parent | 1ac177febfdd0dfc5a5b40a1b30294de0e2a45e0 (diff) | |
| download | vyos-1x-bebd084651b50171e696af232a9c403f69ac6230.tar.gz vyos-1x-bebd084651b50171e696af232a9c403f69ac6230.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
openvpn: bridge: T1556: remove obsolete bridge-group definition
ifconfig: T1849: fix DHCPv6 startup
Python/VyOS validate: T1849: handle is_ipv6()/is_ipv6() exceptions
ifconfig: T1793: remove dhcpv6 client debug output
ddclient: T1853: bugfix TypeError exception
syslog: T1845: syslog host no longer accepts a port
syslog: code formatting
syslog: T1845: syslog host no longer accepts a port
syslog: renaming files and conf script to fit new scheme
T1855, T1826: clean up the reboot/shutdown script.
wireguard: T1853: disable peer doesn't work
Revert "syslog: T1845: syslog host no longer accepts a port"
dmvpn: T1784: Add swanctl load call
syslog: T1845: syslog host no longer accepts a port
[vyos.config] T1847: correctly set_level for path given as empty string
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-openvpn.xml | 39 | ||||
| -rw-r--r-- | interface-definitions/system-syslog.xml (renamed from interface-definitions/syslog.xml) | 15 |
2 files changed, 14 insertions, 40 deletions
diff --git a/interface-definitions/interfaces-openvpn.xml b/interface-definitions/interfaces-openvpn.xml index 2c77bcf37..2c2556f45 100644 --- a/interface-definitions/interfaces-openvpn.xml +++ b/interface-definitions/interfaces-openvpn.xml @@ -33,45 +33,6 @@ </leafNode> </children> </node> - <node name="bridge-group"> - <properties> - <help>Interface to be added to a bridge group</help> - </properties> - <children> - <leafNode name="bridge"> - <properties> - <help>Interface to a bridge-group</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py --type bridge</script> - </completionHelp> - </properties> - </leafNode> - <leafNode name="cost"> - <properties> - <help>Path cost for this port</help> - <valueHelp> - <format>0-2147483647</format> - <description>Path cost for this port</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-2147483647"/> - </constraint> - </properties> - </leafNode> - <leafNode name="cost"> - <properties> - <help>Path priority for this port</help> - <valueHelp> - <format>0-255</format> - <description>Path priority for this port</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 0-255"/> - </constraint> - </properties> - </leafNode> - </children> - </node> <leafNode name="description"> <properties> <help>Description</help> diff --git a/interface-definitions/syslog.xml b/interface-definitions/system-syslog.xml index d5ea4511e..8f4b105c8 100644 --- a/interface-definitions/syslog.xml +++ b/interface-definitions/system-syslog.xml @@ -2,7 +2,7 @@ <interfaceDefinition> <node name="system"> <children> - <node name="syslog" owner="${vyos_conf_scripts_dir}/syslog.py"> + <node name="syslog" owner="${vyos_conf_scripts_dir}/system-syslog.py"> <properties> <help>System logging</help> <priority>400</priority> @@ -191,6 +191,19 @@ </valueHelp> </properties> <children> + <leafNode name="port"> + <properties> + <help>Destination port</help> + <valueHelp> + <format>1-65535</format> + <description>Destination port</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + <constraintErrorMessage>Invalid destination port value</constraintErrorMessage> + </properties> + </leafNode> <tagNode name="facility"> <properties> <help>Facility for logging</help> |