diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-10-05 19:17:51 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-10-05 19:17:51 +0200 |
| commit | bda4784c4831980d06d6ded08268cd590a6bfa0e (patch) | |
| tree | c8e12c3f73fbb9045a77c53771ac46cba3b2a576 /interface-definitions/dhcpv6-server.xml.in | |
| parent | a093620f1525c46f5b63453ca703a9b027a01748 (diff) | |
| download | vyos-1x-bda4784c4831980d06d6ded08268cd590a6bfa0e.tar.gz vyos-1x-bda4784c4831980d06d6ded08268cd590a6bfa0e.zip | |
dhcp(v6)-server: T2961: use fqdn validator wnd move to include snipped
Migrate the domain-search node (which occurs three times) to an includable
snippet. Also re-use the fqdn validator to keep the regex patterns to as few
locations as possible.
Diffstat (limited to 'interface-definitions/dhcpv6-server.xml.in')
| -rw-r--r-- | interface-definitions/dhcpv6-server.xml.in | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/interface-definitions/dhcpv6-server.xml.in b/interface-definitions/dhcpv6-server.xml.in index acc33d40f..0b4bcf9ea 100644 --- a/interface-definitions/dhcpv6-server.xml.in +++ b/interface-definitions/dhcpv6-server.xml.in @@ -60,16 +60,7 @@ </constraint> </properties> </leafNode> - <leafNode name="domain-search"> - <properties> - <help>Domain name for client to search</help> - <constraint> - <regex>[-_a-zA-Z0-9.]+</regex> - </constraint> - <constraintErrorMessage>Invalid domain name. May only contain letters, numbers and .-_</constraintErrorMessage> - <multi/> - </properties> - </leafNode> + #include <include/dhcp-server-domain-search.xml.i> <leafNode name="name-server"> <properties> <help>IPv6 address of a Recursive DNS Server</help> @@ -150,16 +141,7 @@ </tagNode> </children> </node> - <leafNode name="domain-search"> - <properties> - <help>Domain name for client to search</help> - <constraint> - <regex>[-_a-zA-Z0-9.]+</regex> - </constraint> - <constraintErrorMessage>Invalid domain name. May only contain letters, numbers and .-_</constraintErrorMessage> - <multi/> - </properties> - </leafNode> + #include <include/dhcp-server-domain-search.xml.i> <node name="lease-time"> <properties> <help>Parameters relating to the lease time</help> |