diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-04-20 15:11:18 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-04-20 15:11:18 +0200 |
| commit | 05c539ea5595790b297904569cbe13089ce79e18 (patch) | |
| tree | ccf406c7ab59ff1f3ededcd3d08c6be84fa73ec3 /interface-definitions | |
| parent | 890d8b84e372095f988102cbe5921cccb9feb910 (diff) | |
| download | vyos-1x-05c539ea5595790b297904569cbe13089ce79e18.tar.gz vyos-1x-05c539ea5595790b297904569cbe13089ce79e18.zip | |
[hostname] T1336: trailing dots in system domain-name are invalid
Debian/Systemd provides hostnamectl which disabllows setting a FQDN when
there is a trailing (.) in the provided hostname. Extend regex when setting
"system domain-name" that there can't be a trailing (.).
Provide migration script for current installations to remove the dot.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/dns-domain-name.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/interface-definitions/dns-domain-name.xml b/interface-definitions/dns-domain-name.xml index a2c66495f..f5102b3dc 100644 --- a/interface-definitions/dns-domain-name.xml +++ b/interface-definitions/dns-domain-name.xml @@ -34,8 +34,9 @@ <properties> <help>System domain name</help> <constraint> - <regex>[A-Za-z0-9][-.A-Za-z0-9]*</regex> + <regex>^[A-Za-z0-9][-.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"> @@ -69,7 +70,6 @@ <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,7 +107,6 @@ </leafNode> </children> </tagNode> - </children> </node> </children> |