From c8bf1deec9ce169f74049423ba21f6ef1360a3df Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 4 Jul 2021 20:57:15 +0200
Subject: ipsec: T1210: T1251: add remote-access "name-server" definition to
 pool config

---
 data/templates/ipsec/swanctl.conf.tmpl |  2 +-
 interface-definitions/vpn_ipsec.xml.in | 23 ++---------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/data/templates/ipsec/swanctl.conf.tmpl b/data/templates/ipsec/swanctl.conf.tmpl
index 03f1e9942..0eda8479a 100644
--- a/data/templates/ipsec/swanctl.conf.tmpl
+++ b/data/templates/ipsec/swanctl.conf.tmpl
@@ -26,7 +26,7 @@ pools {
 {%    for ra, ra_conf in remote_access.items() if remote_access is defined %}
     ra-{{ ra }} {
         addrs = {{ ra_conf.pool.prefix }}
-        dns = {{ ra_conf.pool.dns_server | join(",") }}
+        dns = {{ ra_conf.pool.name_server | join(",") }}
 {%      if ra_conf.pool.exclude is defined %}
         split_exclude = {{ ra_conf.pool.exclude | join(",") }}
 {%      endif %}
diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index bc802b39e..75fd6a92f 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -810,27 +810,8 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="dns-server">
-                    <properties>
-                      <help>IPv4 or IPv6 DNS addresses for pool</help>
-                      <completionHelp>
-                        <list>any</list>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 DNS address for pool</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>ipv6</format>
-                        <description>IPv6 DNS address for pool</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                        <validator name="ipv6-address"/>
-                      </constraint>
-                      <multi/>
-                    </properties>
-                  </leafNode>
+                  <!-- Include Accel-PPP definition here, maybe time for a rename? -->
+                  #include <include/accel-ppp/name-server.xml.i>
                 </children>
               </node>
               <leafNode name="timeout">
-- 
cgit v1.2.3