Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  T1855, T1826: Restore support for reboot/poweroff in M minutes.
  vyos.config: T1764: allow for list argument to exists, in value case
  vyos.config: T1846: ignore edit level when obtaining working config
  T1843: use include files for interface proxy-arp-pvlan option
  T1843: use include files for interface proxy-arp configuration
  T1843: use include files for interface arp-cache-timeout configuration
  T1843: use include files for interface link-detect feature
  T1843: use include files for interface MTU size
  T1843: use include files for interface MAC address
  T1843: use include files to disable interface (admin down)
  T1843: use include files for interface description
  T1843: use include files for DHCP/DHCPv6 options
  T1843: recursively include IP address definitions in VIF/VIF-S definitions
  T1843: add support for recursive includes
  T1843: use include files for VIF/VIF-S interfaces
  T1843: use include files for IPv4/IPv6 interface address configuration
  T1843: run interface-definitions though GCC preprocessor

1 files changed, 115 insertions, 0 deletions

diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in
new file mode 100644
index 000000000..c16f0b02a
--- /dev/null
+++ b/interface-definitions/dns-domain-name.xml.in
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!-- host-name configuration -->
+<interfaceDefinition>
+  <node name="system">
+    <children>
+      <leafNode name="name-server" owner="${vyos_conf_scripts_dir}/host_name.py">
+        <properties>
+          <help>Domain Name Server (DNS)</help>
+          <priority>400</priority>
+          <valueHelp>
+            <format>ipv4</format>
+            <description>Domain Name Server (DNS) address</description>
+          </valueHelp>
+          <valueHelp>
+            <format>ipv6</format>
+            <description>Domain Name Server (DNS) address</description>
+          </valueHelp>
+          <multi/>
+          <constraint>
+            <validator name="ipv4-address"/>
+            <validator name="ipv6-address"/>
+          </constraint>
+        </properties>
+      </leafNode>
+      <leafNode name="host-name" owner="${vyos_conf_scripts_dir}/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>
+      </leafNode>
+      <leafNode name="domain-name" owner="${vyos_conf_scripts_dir}/host_name.py">
+        <properties>
+          <help>System domain name</help>
+          <constraint>
+            <regex>[A-Za-z0-9][-.A-Za-z0-9]*</regex>
+          </constraint>
+        </properties>
+      </leafNode>
+      <node name="domain-search" owner="${vyos_conf_scripts_dir}/host_name.py">
+        <properties>
+          <help>Domain Name Server (DNS) domain completion order</help>
+          <priority>400</priority>
+        </properties>
+        <children>
+          <leafNode name="domain">
+            <properties>
+              <help>DNS domain completion order</help>
+              <constraint>
+                <regex>^[-a-zA-Z0-9.]+$</regex>
+              </constraint>
+              <constraintErrorMessage>Invalid domain name</constraintErrorMessage>
+              <multi/>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+      <leafNode name="disable-dhcp-nameservers" owner="${vyos_conf_scripts_dir}/host_name.py">
+        <properties>
+          <help>Disable DHCP updates of DNS settings</help>
+          <priority>300</priority>
+          <valueless/>
+        </properties>
+      </leafNode>
+      <node name="static-host-mapping" owner="${vyos_conf_scripts_dir}/host_name.py">
+        <properties>
+          <help>Map host names to addresses</help>
+          <priority>400</priority>
+        </properties>
+        <children>
+
+          <tagNode name="host-name">
+            <properties>
+              <help>Host name for static address mapping</help>
+              <constraint>
+                <regex>^[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$</regex>
+              </constraint>
+              <constraintErrorMessage>invalid hostname</constraintErrorMessage>
+            </properties>
+            <children>
+              <leafNode name="alias">
+                <properties>
+                  <help>Alias for this address</help>
+                  <constraint>
+                    <regex>^.{1,63}$</regex>
+                  </constraint>
+                  <constraintErrorMessage>invalid alias hostname, needs to be between 1 and 63 charactes</constraintErrorMessage>
+                  <multi />
+                </properties>
+              </leafNode>
+              <leafNode name="inet">
+                <properties>
+                  <help>IP Address [REQUIRED]</help>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>IPv4 address</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ip-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>