diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-22 19:02:18 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-22 19:02:18 +0200 |
| commit | 2703915afb9a6bf266adc8834ab01ef721c03424 (patch) | |
| tree | 6314ea4f1861bae76ecdc8465e23f96883c30334 /interface-definitions/vpn_l2tp.xml.in | |
| parent | d2477601a6c4f5f11773493cacfdc54e5f9a01ae (diff) | |
| parent | 6f090e918bae878463aa683511ceab4fbbbade54 (diff) | |
| download | vyos-1x-2703915afb9a6bf266adc8834ab01ef721c03424.tar.gz vyos-1x-2703915afb9a6bf266adc8834ab01ef721c03424.zip | |
Merge branch 'pptp-rewrite' of github.com:c-po/vyos-1x into current
* 'pptp-rewrite' of github.com:c-po/vyos-1x:
accel-ppp: fix wrong reference in verify() on missing attributes
accel-ppp: T2314: bugfix wrong placement of endif in Jinja2 template
vpn: pptp: T2351: add support for common radius-additions XML
vpn: pptp: T2351: migrate to common radius CLI
vpn: pptp: T2351: migrate to common name-server, wins-server nodes
accel-ppp: provide common wins-server include definition
vpn: pptp: T2351: use first IP from client pool as gateway address
vpn: pptp: T2351: align configuration to other accel implementations
vpn: pptp: T2351: migrate from SysVinit to systemd
vyos.util: migrate all cpu_count() occurances to common get_half_cpus()
Diffstat (limited to 'interface-definitions/vpn_l2tp.xml.in')
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index ab0435172..702ef8b5a 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -165,19 +165,7 @@ </leafNode> </children> </node> - <leafNode name="wins-server"> - <properties> - <help>Windows Internet Name Service (WINS) servers propagated to client</help> - <valueHelp> - <format>ipv4</format> - <description>Domain Name Server (DNS) IPv4 address</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - <multi/> - </properties> - </leafNode> + #include <include/accel-wins-server.xml.i> <node name="client-ip-pool"> <properties> <help>Pool of client IP addresses (must be within a /24)</help> |