From 3a9cabbc9568d5d059789b349374c8af3cb25e2f Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@sentrium.io>
Date: Fri, 13 Dec 2019 13:08:47 -0600
Subject: service https: T1443: reorder elements for clarity

---
 interface-definitions/https.xml.in | 47 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

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

diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in
index 4c91bbd94..fd4395ce9 100644
--- a/interface-definitions/https.xml.in
+++ b/interface-definitions/https.xml.in
@@ -51,30 +51,6 @@
               </leafNode>
             </children>
           </tagNode>
-          <node name="certificates">
-            <properties>
-              <help>TLS certificates</help>
-            </properties>
-            <children>
-              <node name="system-generated-certificate" owner="${vyos_conf_scripts_dir}/vyos_cert.py">
-                <properties>
-                  <help>Use an automatically generated self-signed certificate</help>
-                  <valueless/>
-                </properties>
-                <children>
-                  <leafNode name="lifetime">
-                    <properties>
-                      <help>Lifetime in days; default is 365</help>
-                      <valueHelp>
-                        <format>1-65535</format>
-                        <description>Number of days</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-            </children>
-          </node>
           <node name="api" owner="${vyos_conf_scripts_dir}/http-api.py">
             <properties>
               <help>VyOS HTTP API configuration</help>
@@ -127,6 +103,29 @@
               </leafNode>
             </children>
           </node>
+          <node name="certificates">
+            <properties>
+              <help>TLS certificates</help>
+            </properties>
+            <children>
+              <node name="system-generated-certificate" owner="${vyos_conf_scripts_dir}/vyos_cert.py">
+                <properties>
+                  <help>Use an automatically generated self-signed certificate</help>
+                </properties>
+                <children>
+                  <leafNode name="lifetime">
+                    <properties>
+                      <help>Lifetime in days; default is 365</help>
+                      <valueHelp>
+                        <format>1-65535</format>
+                        <description>Number of days</description>
+                      </valueHelp>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3