diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-07-17 07:24:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 07:24:32 +0200 |
| commit | b04c4e21a07126d40702123e1122cd200883ccda (patch) | |
| tree | ff58714ca75a7439e7fdfa3b9cb751294673c0fe /interface-definitions/vpn_l2tp.xml.in | |
| parent | a2ff17e46ec030168de044ac06ffd5023a3d6a22 (diff) | |
| parent | 3af38a4d673c37ed46d7d8d43ad03a94799ad09d (diff) | |
| download | vyos-1x-b04c4e21a07126d40702123e1122cd200883ccda.tar.gz vyos-1x-b04c4e21a07126d40702123e1122cd200883ccda.zip | |
Merge pull request #924 from sarthurdev/ipsec_l2tp_pki
pki: ipsec: l2tp: T2816: T3642: Move IPSec/L2TP code into vpn_ipsec.py and update to use PKI.
Diffstat (limited to 'interface-definitions/vpn_l2tp.xml.in')
| -rw-r--r-- | interface-definitions/vpn_l2tp.xml.in | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in index 4fbf3fa44..d9680c5db 100644 --- a/interface-definitions/vpn_l2tp.xml.in +++ b/interface-definitions/vpn_l2tp.xml.in @@ -75,46 +75,7 @@ <help>Pre-shared secret for IPsec</help> </properties> </leafNode> - <node name="x509"> - <properties> - <help>X.509 certificate</help> - </properties> - <children> - #include <include/certificate-ca.xml.i> - <leafNode name="crl-file"> - <properties> - <help>File containing the X.509 Certificate Revocation List (CRL)</help> - <valueHelp> - <format>txt</format> - <description>File in /config/auth</description> - </valueHelp> - </properties> - </leafNode> - <leafNode name="server-cert-file"> - <properties> - <help>File containing the X.509 certificate for the remote access VPN server (this host)</help> - <valueHelp> - <format>txt</format> - <description>File in /config/auth</description> - </valueHelp> - </properties> - </leafNode> - <leafNode name="server-key-file"> - <properties> - <help>File containing the private key for the X.509 certificate for the remote access VPN server (this host)</help> - <valueHelp> - <format>txt</format> - <description>File in /config/auth</description> - </valueHelp> - </properties> - </leafNode> - <leafNode name="server-key-password"> - <properties> - <help>Password that protects the private key</help> - </properties> - </leafNode> - </children> - </node> + #include <include/ipsec/authentication-x509.xml.i> </children> </node> <leafNode name="ike-lifetime"> @@ -128,6 +89,7 @@ <validator name="numeric" argument="--range 30-86400"/> </constraint> </properties> + <defaultValue>3600</defaultValue> </leafNode> <leafNode name="lifetime"> <properties> @@ -140,7 +102,10 @@ <validator name="numeric" argument="--range 30-86400"/> </constraint> </properties> + <defaultValue>3600</defaultValue> </leafNode> + #include <include/ipsec/esp-group.xml.i> + #include <include/ipsec/ike-group.xml.i> </children> </node> #include <include/accel-ppp/wins-server.xml.i> |