From 05c539ea5595790b297904569cbe13089ce79e18 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 20 Apr 2019 15:11:18 +0200
Subject: [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.
---
 interface-definitions/dns-domain-name.xml |  7 +++----
 src/migration-scripts/system/11-to-12     | 32 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100755 src/migration-scripts/system/11-to-12

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>
diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12
new file mode 100755
index 000000000..159fd771b
--- /dev/null
+++ b/src/migration-scripts/system/11-to-12
@@ -0,0 +1,32 @@
+#!/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)
-- 
cgit v1.2.3