diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-04-20 15:29:11 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-04-20 15:29:11 +0200 |
| commit | 7681f586860bb4ad22f5b83fb6144a13556954c4 (patch) | |
| tree | 1d9520fc735aad9721ccb0aa8d30dfb1cae45157 /interface-definitions/dns-domain-name.xml | |
| parent | 05c539ea5595790b297904569cbe13089ce79e18 (diff) | |
| download | vyos-1x-7681f586860bb4ad22f5b83fb6144a13556954c4.tar.gz vyos-1x-7681f586860bb4ad22f5b83fb6144a13556954c4.zip | |
Revert "[hostname] T1336: trailing dots in system domain-name are invalid"
This reverts commit 05c539ea5595790b297904569cbe13089ce79e18.
Diffstat (limited to 'interface-definitions/dns-domain-name.xml')
| -rw-r--r-- | interface-definitions/dns-domain-name.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/interface-definitions/dns-domain-name.xml b/interface-definitions/dns-domain-name.xml index f5102b3dc..a2c66495f 100644 --- a/interface-definitions/dns-domain-name.xml +++ b/interface-definitions/dns-domain-name.xml @@ -34,9 +34,8 @@ <properties> <help>System domain name</help> <constraint> - <regex>^[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$</regex> + <regex>[A-Za-z0-9][-.A-Za-z0-9]*</regex> </constraint> - <constraintErrorMessage>invalid domain name</constraintErrorMessage> </properties> </leafNode> <node name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py"> @@ -70,6 +69,7 @@ <priority>400</priority> </properties> <children> + <tagNode name="host-name"> <properties> <help>Host name for static address mapping</help> @@ -86,7 +86,7 @@ <regex>^.{1,63}$</regex> </constraint> <constraintErrorMessage>invalid alias hostname, needs to be between 1 and 63 charactes</constraintErrorMessage> - <multi/> + <multi /> </properties> </leafNode> <leafNode name="inet"> @@ -107,6 +107,7 @@ </leafNode> </children> </tagNode> + </children> </node> </children> |