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/vpn_openconnect.xml.in | 42 ++--------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

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

diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in
index 791efcd80..ccf537e04 100644
--- a/interface-definitions/vpn_openconnect.xml.in
+++ b/interface-definitions/vpn_openconnect.xml.in
@@ -116,45 +116,9 @@
               <help>SSL Certificate, SSL Key and CA (/config/auth)</help>
             </properties>
             <children>
-              <leafNode name="ca-cert-file">
-                <properties>
-                  <help>Certificate Authority certificate</help>
-                  <completionHelp>
-                    <script>ls /config/auth</script>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>file</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="cert-file">
-                <properties>
-                  <help>Server Certificate</help>
-                  <valueHelp>
-                    <format>file</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-              <leafNode name="key-file">
-                <properties>
-                  <help>Privat Key of the Server Certificate</help>
-                  <valueHelp>
-                    <format>file</format>
-                    <description>File in /config/auth directory</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="file-exists" argument="--directory /config"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/certificate.xml.i>
+              #include <include/certificate-ca.xml.i>
+              #include <include/certificate-key.xml.i>
             </children>
           </node>
           <node name="network-settings">
-- 
cgit v1.2.3