diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-30 12:00:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-30 12:00:58 +0100 |
| commit | 39b63971dc754b68f4c85f01415d41ddae7e1687 (patch) | |
| tree | fdaa4588804c613fc3c19afca342886819792700 /interface-definitions | |
| parent | 865e4290ce1da42df55088bebd3a389cdcf81806 (diff) | |
| parent | 5fcbb5709af063c6f9ffaaa32ede0c9e2787c6f5 (diff) | |
| download | vyos-1x-39b63971dc754b68f4c85f01415d41ddae7e1687.tar.gz vyos-1x-39b63971dc754b68f4c85f01415d41ddae7e1687.zip | |
Merge pull request #2720 from vyos/mergify/bp/sagitta/pr-2718
system: T5877: Shorten system domain-search config path (backport #2718)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dns-domain-name.xml.in | 21 | ||||
| -rw-r--r-- | interface-definitions/include/version/system-version.xml.i | 2 |
2 files changed, 8 insertions, 15 deletions
diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index ef34ecbf5..b5b3692b1 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -45,24 +45,17 @@ </constraint> </properties> </leafNode> - <node name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py"> + <leafNode name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py"> <properties> <help>Domain Name Server (DNS) domain completion order</help> <priority>400</priority> + <constraint> + <validator name="fqdn"/> + </constraint> + <constraintErrorMessage>Invalid domain name (RFC 1123 section 2).\nMay only contain letters, numbers and period.</constraintErrorMessage> + <multi/> </properties> - <children> - <leafNode name="domain"> - <properties> - <help>DNS domain completion order</help> - <constraint> - <regex>[-a-zA-Z0-9.]+</regex> - </constraint> - <constraintErrorMessage>Invalid domain name</constraintErrorMessage> - <multi/> - </properties> - </leafNode> - </children> - </node> + </leafNode> <node name="static-host-mapping" owner="${vyos_conf_scripts_dir}/host_name.py"> <properties> <help>Map host names to addresses</help> diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i index 73df8bd8e..fcb24abe2 100644 --- a/interface-definitions/include/version/system-version.xml.i +++ b/interface-definitions/include/version/system-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/system-version.xml.i --> -<syntaxVersion component='system' version='26'></syntaxVersion> +<syntaxVersion component='system' version='27'></syntaxVersion> <!-- include end --> |