diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-02-15 15:09:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-15 15:09:07 +0000 |
| commit | 2bc62337b3a1474bba3e1027292ca8d0e443b297 (patch) | |
| tree | 32c69c3091590069626446611174c3f61d00b7d1 /interface-definitions/vpn_l2tp.xml.in | |
| parent | 71497e76c9cf0724581505f50e8b78b6e1c47316 (diff) | |
| parent | ac6a16f6c5ad7700789759e1ec093236c2e182a2 (diff) | |
| download | vyos-1x-2bc62337b3a1474bba3e1027292ca8d0e443b297.tar.gz vyos-1x-2bc62337b3a1474bba3e1027292ca8d0e443b297.zip | |
Merge pull request #3004 from aapostoliuk/T6029-circinus
T6029: Rewritten Accel-PPP services to an identical feature set
Diffstat (limited to 'interface-definitions/vpn_l2tp.xml.in')
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 83 |
1 files changed, 43 insertions, 40 deletions
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 6148e3269..85a375db4 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -30,42 +30,6 @@ </node> </children> </node> - #include <include/accel-ppp/max-concurrent-sessions.xml.i> - #include <include/accel-ppp/mtu-128-16384.xml.i> - <leafNode name="mtu"> - <defaultValue>1436</defaultValue> - </leafNode> - <leafNode name="outside-address"> - <properties> - <help>External IP address to which VPN clients will connect</help> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - </leafNode> - #include <include/accel-ppp/gateway-address.xml.i> - #include <include/name-server-ipv4-ipv6.xml.i> - <node name="lns"> - <properties> - <help>L2TP Network Server (LNS)</help> - </properties> - <children> - <leafNode name="shared-secret"> - <properties> - <help>Tunnel password used to authenticate the client (LAC)</help> - </properties> - </leafNode> - <leafNode name="host-name"> - <properties> - <help>Sent to the client (LAC) in the Host-Name attribute</help> - <constraint> - #include <include/constraint/host-name.xml.i> - </constraint> - <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage> - </properties> - </leafNode> - </children> - </node> <node name="ipsec-settings"> <properties> <help>Internet Protocol Security (IPsec) for remote access L2TP VPN</help> @@ -129,14 +93,53 @@ #include <include/ipsec/ike-group.xml.i> </children> </node> - #include <include/accel-ppp/wins-server.xml.i> + <node name="lns"> + <properties> + <help>L2TP Network Server (LNS)</help> + </properties> + <children> + <leafNode name="shared-secret"> + <properties> + <help>Tunnel password used to authenticate the client (LAC)</help> + </properties> + </leafNode> + <leafNode name="host-name"> + <properties> + <help>Sent to the client (LAC) in the Host-Name attribute</help> + <constraint> + #include <include/constraint/host-name.xml.i> + </constraint> + <constraintErrorMessage>Host-name must be alphanumeric and can contain hyphens</constraintErrorMessage> + </properties> + </leafNode> + </children> + </node> + <leafNode name="outside-address"> + <properties> + <help>External IP address to which VPN clients will connect</help> + <constraint> + <validator name="ipv4-address"/> + </constraint> + </properties> + </leafNode> #include <include/accel-ppp/client-ip-pool.xml.i> #include <include/accel-ppp/client-ipv6-pool.xml.i> - #include <include/generic-description.xml.i> - #include <include/dhcp-interface.xml.i> - #include <include/accel-ppp/ppp-options.xml.i> #include <include/accel-ppp/default-pool.xml.i> #include <include/accel-ppp/default-ipv6-pool.xml.i> + #include <include/accel-ppp/extended-scripts.xml.i> + #include <include/accel-ppp/gateway-address.xml.i> + #include <include/accel-ppp/limits.xml.i> + #include <include/accel-ppp/max-concurrent-sessions.xml.i> + #include <include/accel-ppp/mtu-128-16384.xml.i> + <leafNode name="mtu"> + <defaultValue>1436</defaultValue> + </leafNode> + #include <include/accel-ppp/ppp-options.xml.i> + #include <include/accel-ppp/shaper.xml.i> + #include <include/accel-ppp/snmp.xml.i> + #include <include/accel-ppp/wins-server.xml.i> + #include <include/generic-description.xml.i> + #include <include/name-server-ipv4-ipv6.xml.i> </children> </node> </children> |