From b6810edc7c31b171116c8ab87b3a25bee5727b7c Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Wed, 16 May 2018 07:40:54 +0200
Subject: T574: fix the hostname configuration script and add the domain-name
 command.

Fix multiple syntax errors.
Restart rsyslog after update since it uses the hostname.
Write the 127.0 entry to /etc/hosts, since sudo complains when it cannot resolve it.
---
 interface-definitions/host-name.xml | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/host-name.xml b/interface-definitions/host-name.xml
index 1452a956a..4ab244f6a 100644
--- a/interface-definitions/host-name.xml
+++ b/interface-definitions/host-name.xml
@@ -5,18 +5,22 @@
 <interfaceDefinition>
   <node name="system">
     <children>
-      <node name="host-name" owner="${vyos_sbindir}/vyos-config-host-name.py">
+      <leafNode name="host-name" owner="${vyos_sbindir}/vyos-config-host-name.py">
         <properties>
           <help>System host name (default: vyos)</help>
+          <constraint>
+            <regex>[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]</regex>
+          </constraint>
         </properties>
-        <children>
-          <leafNode name="hostname">
-            <properties>
-              <help>System host name (default: vyos)</help>
-            </properties>
-          </leafNode>
-        </children>
-      </node>
+      </leafNode>
+      <leafNode name="domain-name" owner="${vyos_sbindir}/vyos-config-host-name.py">
+        <properties>
+          <help>System domain name</help>
+          <constraint>
+            <regex>[A-Za-z0-9][-.A-Za-z0-9]*</regex>
+          </constraint>
+        </properties>
+      </leafNode>
     </children>
   </node>
-</interfaceDefinition>
\ No newline at end of file
+</interfaceDefinition>
-- 
cgit v1.2.3