summaryrefslogtreecommitdiff
path: root/interface-definitions/vpn_pptp.xml.in
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-02-02 10:14:35 +0200
committerGitHub <noreply@github.com>2024-02-02 10:14:35 +0200
commitf2de4378b5048fb4fc3a493aa2a214a320dd8d48 (patch)
treec4c389afdc2c14a515bffadfdecf3b691625b928 /interface-definitions/vpn_pptp.xml.in
parent0307801b8928bbaaa20caf5bd10b928bae459490 (diff)
parentd9e57fe65dd538c6ea80637f4f6f23cf11dc583d (diff)
downloadvyos-1x-f2de4378b5048fb4fc3a493aa2a214a320dd8d48.tar.gz
vyos-1x-f2de4378b5048fb4fc3a493aa2a214a320dd8d48.zip
Merge pull request #2891 from aapostoliuk/T5971-circinus
T5971: Rewritten ppp options in accel-ppp services
Diffstat (limited to 'interface-definitions/vpn_pptp.xml.in')
-rw-r--r--interface-definitions/vpn_pptp.xml.in28
1 files changed, 3 insertions, 25 deletions
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index ec622b5d0..d23086c02 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -27,7 +27,7 @@
</properties>
</leafNode>
#include <include/accel-ppp/gateway-address.xml.i>
- #include <include/name-server-ipv4.xml.i>
+ #include <include/name-server-ipv4-ipv6.xml.i>
#include <include/accel-ppp/wins-server.xml.i>
#include <include/accel-ppp/client-ip-pool.xml.i>
<node name="authentication">
@@ -63,30 +63,6 @@
</properties>
<defaultValue>mschap-v2</defaultValue>
</leafNode>
- <leafNode name="mppe">
- <properties>
- <help>Specifies mppe negotioation preference. (default require mppe 128-bit stateless</help>
- <valueHelp>
- <format>deny</format>
- <description>deny mppe</description>
- </valueHelp>
- <valueHelp>
- <format>prefer</format>
- <description>ask client for mppe, if it rejects do not fail</description>
- </valueHelp>
- <valueHelp>
- <format>require</format>
- <description>ask client for mppe, if it rejects drop connection</description>
- </valueHelp>
- <constraint>
- <regex>(deny|prefer|require)</regex>
- </constraint>
- <completionHelp>
- <list>deny prefer require</list>
- </completionHelp>
- </properties>
- <defaultValue>prefer</defaultValue>
- </leafNode>
#include <include/accel-ppp/auth-mode.xml.i>
<node name="local-users">
<properties>
@@ -134,7 +110,9 @@
</children>
</node>
#include <include/accel-ppp/default-pool.xml.i>
+ #include <include/accel-ppp/client-ipv6-pool.xml.i>
#include <include/accel-ppp/default-ipv6-pool.xml.i>
+ #include <include/accel-ppp/ppp-options.xml.i>
</children>
</node>
</children>