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, 121 insertions, 0 deletions

diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
new file mode 100644
index 000000000..6be0292a1
--- /dev/null
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="interfaces">
+    <children>
+      <tagNode name="wireguard" owner="${vyos_conf_scripts_dir}/interfaces-wireguard.py">
+        <properties>
+          <help>WireGuard interface name</help>
+          <priority>459</priority>
+          <!-- subsequent ones may be removed, just make sure ethernet ifs are present -->
+          <constraint>
+            <regex>^wg[0-9]{1,4}</regex>
+          </constraint>
+          <constraintErrorMessage>illegal interface name</constraintErrorMessage>
+          <valueHelp>
+            <format>wgN</format>
+            <description>WireGuard interface name</description>
+          </valueHelp>
+        </properties>
+        <children>
+          #include <include/address-ipv4-ipv6.xml.i>
+          #include <include/interface-description.xml.i>
+          #include <include/interface-disable.xml.i>
+          <leafNode name="port">
+            <properties>
+              <help>Local port number to accept connections</help>
+              <constraint>
+                <validator name="numeric" argument="--range 1024-65535"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="mtu">
+            <properties>
+              <help>interface mtu size(default: 1420)</help>
+              <constraint>
+                <validator name="numeric" argument="--range 68-9000"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="fwmark">
+            <properties>
+              <help>A 32-bit fwmark value set on all outgoing packets</help>
+              <valueHelp>
+                <format>number</format>
+                <description>value which marks the packet for QoS/shaper</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-255"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="private-key">
+            <properties>
+              <help>Private key to use on that interface</help>
+              <completionHelp>
+                <script>${vyos_op_scripts_dir}/wireguard.py --listkdir</script>
+              </completionHelp>
+            </properties>
+          </leafNode>
+          <tagNode name="peer">
+            <properties>
+              <help>peer alias</help>
+              <constraint>
+                <regex>[^ ]{1,100}$</regex>
+              </constraint>
+              <constraintErrorMessage>peer alias too long (limit 100 characters)</constraintErrorMessage>
+            </properties>
+            <children>
+              <leafNode name="disable">
+                <properties>
+                  <help>disables peer</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="pubkey">
+                <properties>
+                  <help>base64 encoded public key</help>
+                  <constraint>
+                    <regex>^[0-9a-zA-Z\+/]{43}=$</regex>
+                  </constraint>
+                  <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="preshared-key">
+                <properties>
+                  <help>base64 encoded preshared key</help>
+                  <constraint>
+                    <regex>^[0-9a-zA-Z\+/]{43}=$</regex>
+                  </constraint>
+                  <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="allowed-ips">
+                <properties>
+                  <help>IP addresses allowed to traverse the peer</help>
+                  <constraint>
+                    <validator name="ip-prefix"/>
+                  </constraint>
+                  <multi/>
+                </properties>
+              </leafNode>
+              <!--  eventually check format IP:port -->
+              <leafNode name="endpoint">
+                <properties>
+                  <help>Remote endpoint (IP:port)</help>
+                </properties>
+              </leafNode>
+              <leafNode name="persistent-keepalive">
+                <properties>
+                  <help>how often send keep alives in seconds</help>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+        </children>
+      </tagNode>
+    </children>
+  </node>
+</interfaceDefinition>