From 861945045ca04b21e27ad31513b2ff929349ee2e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 24 Jul 2021 23:04:25 +0200
Subject: ipsec: T1210: move DHCP server configuration unter remote-access node

As this is only related to remote-access, keeping it under "options" simply
feels wrong.
---
 interface-definitions/vpn_ipsec.xml.in | 61 +++++++++++++++-------------------
 1 file changed, 27 insertions(+), 34 deletions(-)

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

diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index 4cd1936a2..858adb13a 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -630,40 +630,6 @@
                   <valueless/>
                 </properties>
               </leafNode>
-              <node name="remote-access">
-                <properties>
-                  <help>remote-access global options</help>
-                </properties>
-                <children>
-                  <node name="dhcp">
-                    <properties>
-                      <help>DHCP pool options for remote-access</help>
-                    </properties>
-                    <children>
-                      <leafNode name="interface">
-                        <properties>
-                          <help>Interface with DHCP server to use</help>
-                          <completionHelp>
-                            <script>${vyos_completion_dir}/list_interfaces.py</script>
-                          </completionHelp>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="server">
-                        <properties>
-                          <help>DHCP server address</help>
-                          <valueHelp>
-                            <format>ipv4</format>
-                            <description>DHCP server IPv4 address</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="ipv4-address"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                </children>
-              </node>
             </children>
           </node>
           <tagNode name="profile">
@@ -835,6 +801,33 @@
                   </leafNode>
                 </children>
               </tagNode>
+              <node name="dhcp">
+                <properties>
+                  <help>DHCP pool options for remote-access</help>
+                </properties>
+                <children>
+                  <leafNode name="interface">
+                    <properties>
+                      <help>Interface with DHCP server to use</help>
+                      <completionHelp>
+                        <script>${vyos_completion_dir}/list_interfaces.py</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="server">
+                    <properties>
+                      <help>DHCP server address</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>DHCP server IPv4 address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
               <tagNode name="pool">
                 <properties>
                   <help>IP address pool for remote-access users</help>
-- 
cgit v1.2.3