From b72fff14c4061e26657835d72e0944229a196940 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 18 Sep 2021 22:09:05 +0200
Subject: dhcp-server: T3839: support name-servers and domain config per
 shared-network

DHCP servers "shared-network" level only makes sense if one can specify
configuration items that can be inherited by individual subnets. This is now
possible for name-servers and the domain-name.

set service dhcp-server shared-network-name LAN domain-name 'vyos.net'
set service dhcp-server shared-network-name LAN name-server '192.0.2.1'

(cherry picked from commit d411a40a3598c55fae7abd8bc5f1876007aa704b)
---
 data/templates/dhcp-server/dhcpd.conf.tmpl           |  6 ++++++
 interface-definitions/dhcp-server.xml.in             | 12 +++---------
 interface-definitions/include/dhcp-domain-name.xml.i | 11 +++++++++++
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 interface-definitions/include/dhcp-domain-name.xml.i

diff --git a/data/templates/dhcp-server/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl
index 7173986a4..a2d5cb242 100644
--- a/data/templates/dhcp-server/dhcpd.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpd.conf.tmpl
@@ -70,6 +70,12 @@ shared-network {{ network | replace('_','-') }} {
 {%     if network_config.authoritative is defined %}
     authoritative;
 {%     endif %}
+{%     if network_config.name_server is defined and network_config.name_server is not none %}
+    option domain-name-servers {{ network_config.name_server | join(', ') }};
+{%     endif %}
+{%     if network_config.domain_name is defined and network_config.domain_name is not none %}
+    option domain-name "{{ network_config.domain_name }}";
+{%     endif %}
 {%     if network_config.ping_check is defined %}
     ping-check true;
 {%     endif %}
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 502a07c05..3a2c05698 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -103,6 +103,8 @@
                 </properties>
               </leafNode>
               #include <include/dhcp-ping-check.xml.i>
+              #include <include/dhcp-domain-name.xml.i>
+              #include <include/name-server-ipv4.xml.i>
               #include <include/generic-description.xml.i>
               #include <include/generic-disable-node.xml.i>
               <leafNode name="shared-network-parameters">
@@ -164,15 +166,7 @@
                     </properties>
                   </leafNode>
                   #include <include/name-server-ipv4.xml.i>
-                  <leafNode name="domain-name">
-                    <properties>
-                      <help>Client Domain Name</help>
-                      <constraint>
-                        <validator name="fqdn"/>
-                      </constraint>
-                      <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
-                    </properties>
-                  </leafNode>
+                  #include <include/dhcp-domain-name.xml.i>
                   #include <include/dhcp-server-domain-search.xml.i>
                   <leafNode name="enable-failover">
                     <properties>
diff --git a/interface-definitions/include/dhcp-domain-name.xml.i b/interface-definitions/include/dhcp-domain-name.xml.i
new file mode 100644
index 000000000..eb95596da
--- /dev/null
+++ b/interface-definitions/include/dhcp-domain-name.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from dhcp-domain-name.xml.i -->
+<leafNode name="domain-name">
+  <properties>
+    <help>Client Domain Name</help>
+    <constraint>
+      <validator name="fqdn"/>
+    </constraint>
+    <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and .-_</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3