summaryrefslogtreecommitdiff
path: root/interface-definitions/interfaces-openvpn.xml.in
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-29 10:52:24 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-29 10:55:39 +0100
commitda23f084863d6bde2bb50fcc175129610fe2a603 (patch)
tree87f3726572b14e889c944fba1b020be8e3743b92 /interface-definitions/interfaces-openvpn.xml.in
parent8568da747d7103b8adea9b925b74101ea818e328 (diff)
downloadvyos-1x-da23f084863d6bde2bb50fcc175129610fe2a603.tar.gz
vyos-1x-da23f084863d6bde2bb50fcc175129610fe2a603.zip
xml: T1466: provide common includes for SSL certificate CLI nodes
Gather all SSL certificate, ca and key nodes into a single representation of XML which can be #included into the XML definitions of the CLI interface to be rendered.
Diffstat (limited to 'interface-definitions/interfaces-openvpn.xml.in')
-rw-r--r--interface-definitions/interfaces-openvpn.xml.in39
1 files changed, 3 insertions, 36 deletions
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 4c572a8b2..95a14d718 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -687,30 +687,8 @@
</constraint>
</properties>
</leafNode>
- <leafNode name="ca-cert-file">
- <properties>
- <help>File containing certificate for Certificate Authority (CA)</help>
- <valueHelp>
- <format>file</format>
- <description>File in /config/auth directory</description>
- </valueHelp>
- <constraint>
- <validator name="file-exists" argument="--directory /config/auth"/>
- </constraint>
- </properties>
- </leafNode>
- <leafNode name="cert-file">
- <properties>
- <help>File containing certificate for this host</help>
- <valueHelp>
- <format>file</format>
- <description>File in /config/auth directory</description>
- </valueHelp>
- <constraint>
- <validator name="file-exists" argument="--directory /config/auth"/>
- </constraint>
- </properties>
- </leafNode>
+ #include <include/certificate.xml.i>
+ #include <include/certificate-ca.xml.i>
<leafNode name="crl-file">
<properties>
<help>File containing certificate revocation list (CRL) for this host</help>
@@ -735,18 +713,7 @@
</constraint>
</properties>
</leafNode>
- <leafNode name="key-file">
- <properties>
- <help>Private key for this host</help>
- <valueHelp>
- <format>file</format>
- <description>File in /config/auth directory</description>
- </valueHelp>
- <constraint>
- <validator name="file-exists" argument="--directory /config/auth"/>
- </constraint>
- </properties>
- </leafNode>
+ #include <include/certificate-key.xml.i>
<leafNode name="crypt-file">
<properties>
<help>File containing encryption key to authenticate control channel</help>