diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-02-09 08:34:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 08:34:28 +0100 |
| commit | e6f914429daadd2c812ef8cbe051321a8a3e5e60 (patch) | |
| tree | 91914de09186cfae40e6848a9aefeef7c4c39b12 /interface-definitions/vpn_l2tp.xml.in | |
| parent | 267579006a98fbdc5802b428d24a917421a56cb2 (diff) | |
| parent | 3e1a585f9714ffa990bb5751c7a4c7025d7c02fa (diff) | |
| download | vyos-1x-e6f914429daadd2c812ef8cbe051321a8a3e5e60.tar.gz vyos-1x-e6f914429daadd2c812ef8cbe051321a8a3e5e60.zip | |
Merge pull request #2973 from vyos/mergify/bp/sagitta/pr-2950
T5960: Rewritten authentication node in PPTP to a single view (backport #2950)
Diffstat (limited to 'interface-definitions/vpn_l2tp.xml.in')
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 942690bca..6148e3269 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -13,6 +13,23 @@ <help>Remote access L2TP VPN</help> </properties> <children> + <node name="authentication"> + <properties> + <help>Authentication for remote access L2TP VPN</help> + </properties> + <children> + #include <include/accel-ppp/auth-local-users.xml.i> + #include <include/accel-ppp/auth-mode.xml.i> + #include <include/accel-ppp/auth-protocols.xml.i> + #include <include/radius-auth-server-ipv4.xml.i> + #include <include/accel-ppp/radius-additions.xml.i> + <node name="radius"> + <children> + #include <include/accel-ppp/radius-additions-rate-limit.xml.i> + </children> + </node> + </children> + </node> #include <include/accel-ppp/max-concurrent-sessions.xml.i> #include <include/accel-ppp/mtu-128-16384.xml.i> <leafNode name="mtu"> @@ -117,23 +134,6 @@ #include <include/accel-ppp/client-ipv6-pool.xml.i> #include <include/generic-description.xml.i> #include <include/dhcp-interface.xml.i> - <node name="authentication"> - <properties> - <help>Authentication for remote access L2TP VPN</help> - </properties> - <children> - #include <include/accel-ppp/auth-protocols.xml.i> - #include <include/accel-ppp/auth-mode.xml.i> - #include <include/accel-ppp/auth-local-users.xml.i> - #include <include/radius-auth-server-ipv4.xml.i> - #include <include/accel-ppp/radius-additions.xml.i> - <node name="radius"> - <children> - #include <include/accel-ppp/radius-additions-rate-limit.xml.i> - </children> - </node> - </children> - </node> #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> |