fix parameter lookup

Gemfile

@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :test do
-  gem 'voxpupuli-test', '~> 2.5',   :require => false
+  gem 'voxpupuli-test', '~> 5.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 1.0',  :require => false
@@ -21,7 +21,7 @@ end
 
 group :release do
   gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'voxpupuli-release', '>= 1.0.2',            :require => false
+  gem 'voxpupuli-release', '>= 1.2.0',            :require => false
   gem 'puppet-strings', '>= 2.2',                 :require => false
 end
 

data/Amazon.yaml

@@ -1,12 +1,11 @@
 ---
-ssh::server_package_name: 'openssh-server'
-ssh::client_package_name: 'openssh-clients'
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/sbin/sshd'
-ssh::sshd_environments_file: '/etc/sysconfig/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd'
+ssh::server::server_package_name: 'openssh-server'
+ssh::client::client_package_name: 'openssh-clients'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/sbin/sshd'
+ssh::server::sshd_environments_file: '/etc/sysconfig/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/openssh/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/Archlinux.yaml

@@ -1,11 +1,10 @@
 ---
-ssh::server_package_name: 'openssh'
-ssh::client_package_name: 'openssh'
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/bin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd.service'
+ssh::server::server_package_name: 'openssh'
+ssh::client::client_package_name: 'openssh'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/bin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd.service'
 ssh::sftp_server_path: '/usr/lib/ssh/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/Darwin.yaml

@@ -1,8 +1,7 @@
 ---
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'com.openssh.sshd'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'com.openssh.sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/Debian.yaml

@@ -1,12 +1,11 @@
 ---
-ssh::server_package_name: 'openssh-server'
-ssh::client_package_name: 'openssh-client'
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/sbin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::sshd_environments_file: '/etc/default/ssh'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'ssh'
+ssh::server::server_package_name: 'openssh-server'
+ssh::client::client_package_name: 'openssh-client'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/sbin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::server::sshd_environments_file: '/etc/default/ssh'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'ssh'
 ssh::sftp_server_path: '/usr/lib/openssh/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/DragonFly.yaml

@@ -1,9 +1,8 @@
 ---
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/local/sbin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/local/sbin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/FreeBSD.yaml

@@ -1,9 +1,8 @@
 ---
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/local/sbin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/local/sbin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/Gentoo.yaml

@@ -1,11 +1,10 @@
 ---
-ssh::server_package_name: 'openssh'
-ssh::client_package_name: 'openssh'
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/sbin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd'
+ssh::server::server_package_name: 'openssh'
+ssh::client::client_package_name: 'openssh'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/sbin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/lib64/misc/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/OpenBSD.yaml

@@ -1,20 +1,19 @@
 ---
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0
 
-ssh::server_options:
+ssh::server::default_options:
   ChallengeResponseAuthentication: 'no'
   X11Forwarding                  : 'yes'
   PrintMotd                      : 'no'
   AcceptEnv                      : 'LANG LC_*'
   Subsystem                      : "sftp %{lookup('ssh::sftp_server_path')}"
 
-ssh::client_options:
+ssh::client::default_options:
   'Host *':
     SendEnv: 'LANG LC_*'
     HashKnownHosts: 'yes'

data/OpenSuse.yaml → data/OpenSuSE.yaml

@@ -1,3 +1,3 @@
 ---
-ssh::service_name: 'sshd'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/lib/ssh/sftp-server'

data/RedHat-7.yaml

@@ -1,2 +1,2 @@
 ---
-ssh::host_priv_key_group: 'ssh_keys'
+ssh::server::host_priv_key_group: 'ssh_keys'

data/RedHat.yaml

@@ -1,12 +1,11 @@
 ---
-ssh::server_package_name: 'openssh-server'
-ssh::client_package_name: 'openssh-clients'
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/sbin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::sshd_environments_file: '/etc/sysconfig/sshd'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'sshd'
+ssh::server::server_package_name: 'openssh-server'
+ssh::client::client_package_name: 'openssh-clients'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/sbin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::server::sshd_environments_file: '/etc/sysconfig/sshd'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/libexec/openssh/sftp-server'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/SLES.yaml

@@ -1,3 +1,3 @@
 ---
-ssh::service_name: 'sshd'
+ssh::server::service_name: 'sshd'
 ssh::sftp_server_path: '/usr/lib/ssh/sftp-server'

data/SmartOS.yaml

@@ -1,8 +1,7 @@
 ---
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'svc:/network/ssh:default'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'svc:/network/ssh:default'
 ssh::sftp_server_path: 'internal-sftp'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0

data/Solaris-10.yaml

@@ -1,3 +1,3 @@
 ---
-ssh::server_package_name: 'SUNWsshdu'
-ssh::client_package_name: 'SUNWsshu'
+ssh::server::server_package_name: 'SUNWsshdu'
+ssh::client::client_package_name: 'SUNWsshu'

data/Solaris.yaml

@@ -1,16 +1,17 @@
 ---
-ssh::server_package_name: '/service/network/ssh'
-ssh::client_package_name: '/network/ssh'
-ssh::sshd_binary: '/lib/svc/method/sshd'
-ssh::ssh::service_name: 'svc:/network/ssh:default'
+ssh::server::server_package_name: '/service/network/ssh'
+ssh::client::client_package_name: '/network/ssh'
+ssh::server::sshd_binary: '/lib/svc/method/sshd'
+ssh::server::service_name: 'svc:/network/ssh:default'
+ssh::sftp_server_path: 'internal-sftp'
 
-ssh:sshd_default_options:
+ssh::server::default_options:
   ChallengeResponseAuthentication: 'no'
   X11Forwarding: 'yes'
   PrintMotd: 'no'
   Subsystem: "sftp %{lookup('ssh::sftp_server_path')}"
   HostKey:
-    - "%{lookup('ssh::sshd_dir')}/ssh_host_rsa_key"
-    - "%{lookup('ssh::sshd_dir')}/ssh_host_dsa_key"
-
-ssh::client_options: {}
+    - "%{lookup('ssh::server::sshd_dir')}/ssh_host_rsa_key"
+    - "%{lookup('ssh::server::sshd_dir')}/ssh_host_dsa_key"
+  
+ssh::client::default_options: {}

data/Suse.yaml

@@ -1,10 +1,9 @@
 ---
-ssh::server_package_name: 'openssh'
-ssh::client_package_name: 'openssh'
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_binary: '/usr/sbin/sshd'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::sshd_environments_file: '/etc/sysconfig/ssh'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::host_priv_key_group: 0
+ssh::server::server_package_name: 'openssh'
+ssh::client::client_package_name: 'openssh'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_binary: '/usr/sbin/sshd'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::server::sshd_environments_file: '/etc/sysconfig/ssh'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::host_priv_key_group: 0

data/common.yaml

@@ -8,29 +8,31 @@ lookup_options:
     merge: deep
   ssh::users_client_options:
     merge: deep
+  ssh::server::options:
+    merge: deep
+  ssh::client::options:
+    merge: deep
 
-ssh::sshd_dir: '/etc/ssh'
-ssh::sshd_config: '/etc/ssh/sshd_config'
-ssh::ssh_config: '/etc/ssh/ssh_config'
-ssh::ssh_known_hosts: '/etc/ssh/ssh_known_hosts'
-ssh::service_name: 'svc:/network/ssh:default'
+ssh::server::sshd_dir: '/etc/ssh'
+ssh::server::sshd_config: '/etc/ssh/sshd_config'
+ssh::client::ssh_config: '/etc/ssh/ssh_config'
+ssh::server::service_name: 'svc:/network/ssh:default'
 ssh::sftp_server_path: 'internal-sftp'
-ssh::host_priv_key_group: 0
+ssh::server::host_priv_key_group: 0
 ssh::validate_sshd_file             : false
-ssh::user_ssh_directory_default_mode: '0700'
-ssh::user_ssh_config_default_mode   : '0600'
 ssh::collect_enabled                : true   # Collect sshkey resources
-ssh::issue_net                      : '/etc/issue.net'
+ssh::server::issue_net              : '/etc/issue.net'
+ssh::knownhosts::collect_enabled    : true
 
-ssh::server_options:
+ssh::server::default_options:
   ChallengeResponseAuthentication: 'no'
   X11Forwarding: 'yes'
   PrintMotd: 'no'
   AcceptEnv: 'LANG LC_*'
   Subsystem: "sftp %{lookup('ssh::sftp_server_path')}"
   UsePAM: 'yes'
 
-ssh::client_options:
+ssh::client::default_options:
   'Host *':
     SendEnv: 'LANG LC_*'
     HashKnownHosts: 'yes'

lib/facter/ssh_client_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Facter.add('ssh_client_version_full') do
   confine kernel: %w[Linux SunOS FreeBSD DragonFly Darwin]
 
@@ -10,7 +12,7 @@
                 first.
                 rstrip
 
-      version.gsub(%r{^(OpenSSH_|Sun_SSH_)([^ ,]+).*$}, '\2') unless version.nil?
+      version&.gsub(%r{^(OpenSSH_|Sun_SSH_)([^ ,]+).*$}, '\2')
     end
   end
 end
@@ -21,7 +23,7 @@
   setcode do
     version = Facter.value('ssh_client_version_full')
 
-    version.gsub(%r{^([0-9]+\.[0-9]+).*$}, '\1') unless version.nil?
+    version&.gsub(%r{^([0-9]+\.[0-9]+).*$}, '\1')
   end
 end
 
@@ -31,6 +33,6 @@
   setcode do
     version = Facter.value('ssh_client_version_full')
 
-    version.gsub(%r{^([0-9]+\.[0-9]+(?:\.[0-9]+)?).*$}, '\1') unless version.nil?
+    version&.gsub(%r{^([0-9]+\.[0-9]+(?:\.[0-9]+)?).*$}, '\1')
   end
 end

lib/facter/ssh_server_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Facter.add('ssh_server_version_full') do
   confine kernel: %w[Linux SunOS FreeBSD DragonFly Darwin]
 
@@ -13,7 +15,7 @@
                 first.
                 rstrip
 
-      version.gsub(%r{^(OpenSSH_|Sun_SSH_)([^ ,]+).*$}, '\2') unless version.nil?
+      version&.gsub(%r{^(OpenSSH_|Sun_SSH_)([^ ,]+).*$}, '\2')
     end
   end
 end
@@ -40,6 +42,6 @@
   setcode do
     version = Facter.value('ssh_server_version_full')
 
-    version.gsub(%r{^([0-9]+\.[0-9]+(?:\.[0-9]+)?).*$}, '\1') unless version.nil?
+    version&.gsub(%r{^([0-9]+\.[0-9]+(?:\.[0-9]+)?).*$}, '\1')
   end
 end