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

diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
new file mode 100644
index 000000000..8dea94d05
--- /dev/null
+++ b/interface-definitions/ssh.xml.in
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+<!--SSH configuration -->
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="ssh" owner="${vyos_conf_scripts_dir}/ssh.py">
+        <properties>
+          <help>Secure SHell (SSH) protocol</help>
+          <priority>500</priority>
+        </properties>
+        <children>
+          <node name="access-control">
+            <properties>
+              <help>SSH user/group access controls. Directives are processed
+                in the following order: deny-users, allow-users, deny-groups and
+                allow-groups.</help>
+            </properties>
+            <children>
+              <node name="allow">
+                <properties>
+                  <help>Allow user/group SSH access</help>
+                </properties>
+                <children>
+                  <leafNode name="group">
+                    <properties>
+                      <help>Allow members of a group to login</help>
+                      <constraint>
+                        <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex>
+                      </constraint>
+                      <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="user">
+                    <properties>
+                      <help>Allow specific users to login</help>
+                      <constraint>
+                        <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex>
+                      </constraint>
+                      <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="deny">
+                <properties>
+                  <help>Deny user/group SSH access</help>
+                </properties>
+                <children>
+                  <leafNode name="group">
+                    <properties>
+                      <help>Disallow members of a group to login</help>
+                      <constraint>
+                        <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex>
+                      </constraint>
+                      <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="user">
+                    <properties>
+                      <help>Disallow specific users to login</help>
+                      <constraint>
+                        <regex>^[a-z_][a-z0-9_-]{1,31}[$]?</regex>
+                      </constraint>
+                      <constraintErrorMessage>illegal characters or more than 32 characters</constraintErrorMessage>
+                      <multi/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </node>
+          <leafNode name="ciphers">
+            <properties>
+              <help>Allowed ciphers</help>
+              <completionHelp>
+                <script>ssh -Q cipher | tr '\n' ' '</script>
+              </completionHelp>
+              <multi/>
+            </properties>
+          </leafNode>
+          <leafNode name="disable-host-validation">
+            <properties>
+              <help>Disable IP Address to Hostname lookup</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="disable-password-authentication">
+            <properties>
+              <help>Disable password-based authentication</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <leafNode name="key-exchange">
+            <properties>
+              <help>Allowed key exchange (KEX) algorithms</help>
+              <completionHelp>
+                <script>ssh -Q kex | tr '\n' ' '</script>
+              </completionHelp>
+              <multi/>
+            </properties>
+          </leafNode>
+          <leafNode name="listen-address">
+            <properties>
+              <help>Local addresses SSH service should listen on</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>IP address to listen for incoming connections</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6</format>
+                <description>IPv6 address to listen for incoming connections</description>
+              </valueHelp>
+              <multi/>
+              <constraint>
+                <validator name="ipv4-address"/>
+                <validator name="ipv6-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="loglevel">
+            <properties>
+              <help>Log level</help>
+              <valueHelp>
+                <format>QUIET</format>
+                <description>stay silent</description>
+              </valueHelp>
+              <valueHelp>
+                <format>FATAL</format>
+                <description>log fatals only</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ERROR</format>
+                <description>log errors and fatals only</description>
+              </valueHelp>
+              <valueHelp>
+                <format>INFO</format>
+                <description>default log level</description>
+              </valueHelp>
+              <valueHelp>
+                <format>VERBOSE</format>
+                <description>enable logging of failed login attempts</description>
+              </valueHelp>
+            </properties>
+          </leafNode>
+          <leafNode name="mac">
+            <properties>
+              <help>Allowed message authentication code (MAC) algorithms</help>
+              <completionHelp>
+                <script>ssh -Q mac | tr '\n' ' '</script>
+              </completionHelp>
+              <multi/>
+            </properties>
+          </leafNode>
+          <leafNode name="port">
+            <properties>
+              <help>Port for SSH service</help>
+              <valueHelp>
+                <format>1-65535</format>
+                <description>Numeric IP port</description>
+              </valueHelp>
+              <multi/>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="client-keepalive-interval">
+            <properties>
+              <help>how often send keep alives in seconds</help>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/>
+              </constraint>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>