Allow include parameters to accept path arrays

data/os/SLES/15.yaml

@@ -2,7 +2,10 @@
 # (Suse) SLES 15 defaults in alphabetical order per class
 ssh::forward_x11_trusted: 'yes'
 ssh::host: '*'
-ssh::include: '/etc/ssh/ssh_config.d/*.conf /usr/etc/ssh/ssh_config.d/*.conf'
+ssh::include:
+  - '/etc/ssh/ssh_config.d/*.conf'
+  - '/usr/etc/ssh/ssh_config.d/*.conf'
+
 ssh::packages:
   - 'openssh'
 # SLES 15 groups the locale SendEnv directives across three lines.
@@ -16,10 +19,14 @@ ssh::server::accept_env:
   - 'LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES'
   - 'LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT'
   - 'LC_IDENTIFICATION LC_ALL'
+
 ssh::server::authorized_keys_file:
   - '.ssh/authorized_keys'
 ssh::server::client_alive_interval: 180
-ssh::server::include: '/etc/ssh/sshd_config.d/*.conf /usr/etc/ssh/sshd_config.d/*.conf'
+ssh::server::include:
+  - '/etc/ssh/sshd_config.d/*.conf'
+  - '/usr/etc/ssh/sshd_config.d/*.conf'
+ssh::server::permit_root_login: 'yes'
 ssh::server::print_motd: 'no'
 ssh::server::subsystem: 'sftp /usr/lib/ssh/sftp-server'
 ssh::server::use_pam: 'yes'

manifests/init.pp

@@ -542,7 +542,7 @@
   Optional[String[1]] $identity_agent = undef,
   Optional[Array[String[1]]] $identity_file = undef,
   Optional[Array[String[1]]] $ignore_unknown = undef,
-  Optional[Stdlib::Absolutepath] $include = undef,
+  Optional[Variant[Stdlib::Absolutepath, Array[Stdlib::Absolutepath]]] $include = undef,
   String[1] $include_dir_owner = 'root',
   String[1] $include_dir_group = 'root',
   Stdlib::Filemode $include_dir_mode = '0755',
@@ -622,17 +622,27 @@
   }
 
   if $include {
-    $include_dir = dirname($include)
-    file { 'ssh_config_include_dir':
-      ensure  => 'directory',
-      path    => $include_dir,
-      owner   => $include_dir_owner,
-      group   => $include_dir_group,
-      mode    => $include_dir_mode,
-      purge   => $include_dir_purge,
-      recurse => $include_dir_purge,
-      force   => $include_dir_purge,
-      require => $packages_require,
+    case $include {
+      String: {
+        $include_dir = dirname($include)
+        file { 'ssh_config_include_dir':
+          ensure  => 'directory',
+          path    => $include_dir,
+          owner   => $include_dir_owner,
+          group   => $include_dir_group,
+          mode    => $include_dir_mode,
+          purge   => $include_dir_purge,
+          recurse => $include_dir_purge,
+          force   => $include_dir_purge,
+          require => $packages_require,
+        }
+      }
+      Array: {
+        $include_dir = undef
+      }
+      default: {
+        $include_dir = undef
+      }
     }
   } else {
     $include_dir = undef

manifests/server.pp

@@ -531,7 +531,7 @@
   Optional[Array[String[1]]] $host_key_algorithms = undef,
   Optional[Ssh::Yes_no] $ignore_rhosts = undef,
   Optional[Ssh::Yes_no] $ignore_user_known_hosts = undef,
-  Optional[Stdlib::Absolutepath] $include = undef,
+  Optional[Variant[Stdlib::Absolutepath, Array[Stdlib::Absolutepath]]] $include = undef,
   String[1] $include_dir_owner = 'root',
   String[1] $include_dir_group = 'root',
   Stdlib::Filemode $include_dir_mode = '0700',
@@ -621,18 +621,28 @@
   }
 
   if $include {
-    $include_dir = dirname($include)
-    file { 'sshd_config_include_dir':
-      ensure  => 'directory',
-      path    => $include_dir,
-      owner   => $include_dir_owner,
-      group   => $include_dir_group,
-      mode    => $include_dir_mode,
-      purge   => $include_dir_purge,
-      recurse => $include_dir_purge,
-      force   => $include_dir_purge,
-      require => $packages_require,
-      notify  => $notify_service,
+    case $include {
+      String: {
+        $include_dir = dirname($include)
+        file { 'sshd_config_include_dir':
+          ensure  => 'directory',
+          path    => $include_dir,
+          owner   => $include_dir_owner,
+          group   => $include_dir_group,
+          mode    => $include_dir_mode,
+          purge   => $include_dir_purge,
+          recurse => $include_dir_purge,
+          force   => $include_dir_purge,
+          require => $packages_require,
+          notify  => $notify_service,
+        }
+      }
+      Array: {
+        $include_dir = undef
+      }
+      default: {
+        $include_dir = undef
+      }
     }
   } else {
     $include_dir = undef

spec/fixtures/testing/SLES-15_ssh_config

@@ -5,7 +5,8 @@
 
 Host *
   ForwardX11Trusted yes
-  Include /etc/ssh/ssh_config.d/*.conf /usr/etc/ssh/ssh_config.d/*.conf
+  Include /etc/ssh/ssh_config.d/*.conf
+  Include /usr/etc/ssh/ssh_config.d/*.conf
   SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
   SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
   SendEnv LC_IDENTIFICATION LC_ALL

spec/fixtures/testing/SLES-15_sshd_config

@@ -3,7 +3,8 @@
 #
 # See https://man.openbsd.org/sshd_config for more info
 
-Include /etc/ssh/sshd_config.d/*.conf /usr/etc/ssh/sshd_config.d/*.conf
+Include /etc/ssh/sshd_config.d/*.conf
+Include /usr/etc/ssh/sshd_config.d/*.conf
 AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
 AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
 AcceptEnv LC_IDENTIFICATION LC_ALL

templates/ssh_config.erb

@@ -146,7 +146,9 @@ Host <%= @host %>
   IgnoreUnknown <%= @ignore_unknown.join(',') %>
 <% end -%>
 <% if @include != nil -%>
-  Include <%= @include %>
+<%   Array(@include).each do |v| -%>
+  Include <%= v %>
+<%   end -%>
 <% end -%>
 <% if @ip_qos != nil -%>
   IPQoS <%= @ip_qos %>

templates/sshd_config.erb

@@ -4,7 +4,9 @@
 # See https://man.openbsd.org/sshd_config for more info
 
 <% if @include != nil -%>
-Include <%= @include %>
+<%   Array(@include).each do |v| -%>
+Include <%= v %>
+<%   end -%>
 <% end -%>
 <% if @accept_env != nil -%>
 <%   @accept_env.each do |v| -%>