From da23f084863d6bde2bb50fcc175129610fe2a603 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 29 Dec 2020 10:52:24 +0100
Subject: 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.
---
 interface-definitions/interfaces-openvpn.xml.in | 39 ++-----------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

(limited to 'interface-definitions/interfaces-openvpn.xml.in')

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>
-- 
cgit v1.2.3