From 106406d46ba594b86056e3341314e9615a501dd5 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 20 Mar 2020 17:44:25 +0100
Subject: sstp: T2008: dns: unwind configuration

---
 interface-definitions/vpn-sstp.xml.in | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn-sstp.xml.in b/interface-definitions/vpn-sstp.xml.in
index c7c3c3ea5..e2d6aa75e 100644
--- a/interface-definitions/vpn-sstp.xml.in
+++ b/interface-definitions/vpn-sstp.xml.in
@@ -5,7 +5,7 @@
       <node name="sstp" owner="${vyos_conf_scripts_dir}/vpn_sstp.py">
         <properties>
           <help>Secure Socket Tunneling Protocol (SSTP) server</help>
-          <priority>900</priority>
+          <priority>901</priority>
         </properties>
         <children>
           <node name="authentication">
@@ -318,14 +318,9 @@
                   </leafNode>
                 </children>
               </node>
-              <node name="dns-server">
+              <leafNode name="name-server">
                 <properties>
                   <help>DNS servers propagated to clients</help>
-                </properties>
-                <children>
-                  <leafNode name="primary-dns">
-                    <properties>
-                      <help>Primary DNS Server</help>
                       <valueHelp>
                         <format>ipv4</format>
                         <description>IPv4 address</description>
@@ -333,22 +328,9 @@
                       <constraint>
                         <validator name="ipv4-address"/>
                       </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="secondary-dns">
-                    <properties>
-                      <help>Secondary DNS Server</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+                      <multi/>
+                </properties>
+              </leafNode>
               #include <include/interface-mtu-68-1500.xml.i>
             </children>
           </node>
-- 
cgit v1.2.3