summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-09-18 22:09:05 +0200
committerChristian Poessinger <christian@poessinger.com>2021-09-18 22:09:05 +0200
commitd411a40a3598c55fae7abd8bc5f1876007aa704b (patch)
tree216b08561edb7fd8bbc795e62a9c2e65ede7f8e6 /interface-definitions
parent564f05614b6e8650185c46b9625f6a0cd9661639 (diff)
downloadvyos-1x-d411a40a3598c55fae7abd8bc5f1876007aa704b.tar.gz
vyos-1x-d411a40a3598c55fae7abd8bc5f1876007aa704b.zip
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'
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/dhcp-server.xml.in12
-rw-r--r--interface-definitions/include/dhcp-domain-name.xml.i11
2 files changed, 14 insertions, 9 deletions
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 5db46a0c4..e629d96ab 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -53,6 +53,8 @@
<valueless/>
</properties>
</leafNode>
+ #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">
@@ -114,15 +116,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="exclude">
<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 -->