diff options
| -rw-r--r-- | interface-definitions/dns-domain-name.xml | 7 | ||||
| -rwxr-xr-x | src/migration-scripts/system/11-to-12 | 32 |
2 files changed, 4 insertions, 35 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> diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12 deleted file mode 100755 index 159fd771b..000000000 --- a/src/migration-scripts/system/11-to-12 +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 - -# Latest version of Debian/Systemd hostnamectl does not support a trialing dot -# in the systems hostname. Ensure that there is no trailing dot in the configured -# systems domain-name. - -import sys -from vyos.configtree import ConfigTree - -if (len(sys.argv) < 1): - print("Must specify file name!") - sys.exit(1) - -file_name = sys.argv[1] - -with open(file_name, 'r') as f: - config_file = f.read() - -config = ConfigTree(config_file) -if not config.exists(['system', 'domain-name']): - # Nothing to do - sys.exit(0) -else: - domainname = config.return_value(['system', 'domain-name']) - config.set(['system', 'domain-name'], value=domainname.rstrip('.')) - - try: - with open(file_name, 'w') as f: - f.write(config.to_string()) - except OSError as e: - print("Failed to save the modified config: {}".format(e)) - sys.exit(1) |