diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-07-20 15:43:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 15:43:43 +0200 |
commit | 4ff379d18a750314fda2b2fec5a1e285bd92f15c (patch) | |
tree | 36d0090231779a272e03718e1ccc9d6c906f1220 /interface-definitions | |
parent | 2975c5e835fd323ef5d47bebec27e4d08e04dd7a (diff) | |
parent | 70785300b0dbd11bcd805f7d2906e77fc826f4a7 (diff) | |
download | vyos-1x-4ff379d18a750314fda2b2fec5a1e285bd92f15c.tar.gz vyos-1x-4ff379d18a750314fda2b2fec5a1e285bd92f15c.zip |
Merge pull request #930 from sarthurdev/pki_migration
pki: openconnect: sstp: T3642: Migrate OpenConnect and SSTP to PKI configuration
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/vpn_openconnect.xml.in | 9 | ||||
-rw-r--r-- | interface-definitions/vpn_sstp.xml.in | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in index 1a9d39a12..53c0c22b9 100644 --- a/interface-definitions/vpn_openconnect.xml.in +++ b/interface-definitions/vpn_openconnect.xml.in @@ -75,7 +75,7 @@ </node> <node name="listen-ports"> <properties> - <help>SSL Certificate, SSL Key and CA (/config/auth)</help> + <help>Specify custom ports to use for client connections</help> </properties> <children> <leafNode name="tcp"> @@ -108,12 +108,11 @@ </node> <node name="ssl"> <properties> - <help>SSL Certificate, SSL Key and CA (/config/auth)</help> + <help>SSL Certificate, SSL Key and CA</help> </properties> <children> - #include <include/certificate.xml.i> - #include <include/certificate-ca.xml.i> - #include <include/certificate-key.xml.i> + #include <include/pki/ca-certificate.xml.i> + #include <include/pki/certificate-key.xml.i> </children> </node> <node name="network-settings"> diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index c09603028..3576bac90 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -50,12 +50,11 @@ </node> <node name="ssl"> <properties> - <help>SSL Certificate, SSL Key and CA (/config/user-data/sstp)</help> + <help>SSL Certificate, SSL Key and CA</help> </properties> <children> - #include <include/certificate.xml.i> - #include <include/certificate-ca.xml.i> - #include <include/certificate-key.xml.i> + #include <include/pki/ca-certificate.xml.i> + #include <include/pki/certificate.xml.i> </children> </node> </children> |