From 4649284812bb3dbb8c07f0e4dc56226b6da1a703 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 4 Oct 2020 11:37:21 +0200
Subject: sstp: T2953: migrate gateway-address, client-ip-settings to common
 level

* move "network-settings gateway-address" to "gateway-address"
* move "network-settings client-ip-settings" to "client-ip-pool"
---
 interface-definitions/vpn_sstp.xml.in | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index 5ef503041..38c8c0fb8 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -26,24 +26,17 @@
             </children>
           </node>
           #include <include/interface-mtu-68-1500.xml.i>
+          #include <include/accel-gateway-address.xml.i>
           #include <include/accel-name-server.xml.i>
-          <node name="network-settings">
+          <node name="client-ip-pool">
             <properties>
-              <help>Network settings</help>
+              <help>Client IP pools and gateway setting</help>
             </properties>
             <children>
-              <node name="client-ip-settings">
-                <properties>
-                  <help>Client IP pools and gateway setting</help>
-                </properties>
-                <children>
-                  #include <include/accel-client-subnet.xml.i>
-                  #include <include/accel-gateway-address.xml.i>
-                </children>
-              </node>
-              #include <include/accel-client-ipv6-pool.xml.i>
+              #include <include/accel-client-subnet.xml.i>
             </children>
           </node>
+          #include <include/accel-client-ipv6-pool.xml.i>
           <node name="ppp-options">
             <properties>
               <help>PPP (Point-to-Point Protocol) settings</help>
-- 
cgit v1.2.3