From 95c42faa4436c5dd761049a8a6e75996c815cc2c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 20 Mar 2020 23:22:09 +0100
Subject: sstp: T2008: migrate SSL certificate nodes

---
 interface-definitions/vpn-sstp.xml.in | 55 +++++++++++++++--------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn-sstp.xml.in b/interface-definitions/vpn-sstp.xml.in
index cf864b069..59aae9f7f 100644
--- a/interface-definitions/vpn-sstp.xml.in
+++ b/interface-definitions/vpn-sstp.xml.in
@@ -252,42 +252,35 @@
               </node>
             </children>
           </node>
-          <node name="sstp-settings">
+          <node name="ssl">
             <properties>
-              <help>SSTP settings</help>
+              <help>SSL Certificate, SSL Key and CA (/config/user-data/sstp)</help>
             </properties>
             <children>
-              <node name="ssl-certs">
+              <leafNode name="ca-cert-file">
                 <properties>
-                  <help>SSL Certificate, SSL Key and CA (/config/user-data/sstp)</help>
+                  <help>Certificate Authority certificate</help>
+                  <completionHelp>
+                    <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
+                  </completionHelp>
                 </properties>
-                <children>
-                  <leafNode name="ca">
-                    <properties>
-                      <help>Certificate Authority certificate</help>
-                      <completionHelp>
-                        <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="server-cert">
-                    <properties>
-                      <help>Server Certificate</help>
-                      <completionHelp>
-                        <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="server-key">
-                    <properties>
-                      <help>Privat Key of the Server Certificate</help>
-                      <completionHelp>
-                        <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+              </leafNode>
+              <leafNode name="cert-file">
+                <properties>
+                  <help>Server Certificate</help>
+                  <completionHelp>
+                    <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
+                  </completionHelp>
+                </properties>
+              </leafNode>
+              <leafNode name="key-file">
+                <properties>
+                  <help>Privat Key of the Server Certificate</help>
+                  <completionHelp>
+                    <script>if [ -e /config/user-data/sstp ]; then ls /config/user-data/sstp; fi</script>
+                  </completionHelp>
+                </properties>
+              </leafNode>
             </children>
           </node>
           <node name="network-settings">
-- 
cgit v1.2.3