use proper sshd binary location in config validate command (#435)

Author: saz

manifests/server/config.pp

@@ -11,7 +11,7 @@
 
   case $ssh::server::validate_sshd_file {
     true: {
-      $sshd_validate_cmd = '/usr/sbin/sshd -tf %'
+      $sshd_validate_cmd = "${ssh::server::sshd_binary} -tf %"
     }
     default: {
       $sshd_validate_cmd = undef

manifests/server/config_file.pp

@@ -22,7 +22,7 @@
 
   case $ssh::server::validate_sshd_file {
     true: {
-      $sshd_validate_cmd = '/usr/sbin/sshd -tf %'
+      $sshd_validate_cmd = "${ssh::server::sshd_binary} -tf %"
     }
     default: {
       $sshd_validate_cmd = undef

manifests/server/instances.pp

@@ -46,7 +46,7 @@
   if $facts['kernel'] == 'Linux' {
     case $validate_config_file {
       true: {
-        $validate_cmd = '/usr/sbin/sshd -tf %'
+        $validate_cmd = "${ssh::server::sshd_binary} -tf %"
       }
       default: {
         $validate_cmd = undef

spec/classes/init_spec.rb

@@ -134,7 +134,15 @@
           }
         end
 
-        it { is_expected.to contain_concat('/etc/ssh/sshd_config').with_validate_cmd('/usr/sbin/sshd -tf %') }
+        sshd_binary = case os_facts[:os]['family']
+                      when 'FreeBSD'
+                        '/usr/local/sbin/sshd'
+                      when 'Archlinux'
+                        '/usr/bin/sshd'
+                      else
+                        '/usr/sbin/sshd'
+                      end
+        it { is_expected.to contain_concat('/etc/ssh/sshd_config').with_validate_cmd("#{sshd_binary} -tf %") }
       end
 
       context 'without resource purging' do

spec/classes/server_spec.rb

@@ -86,7 +86,26 @@
           }
         end
 
-        it { is_expected.to contain_concat('/etc/ssh/sshd_config').with_validate_cmd('/usr/sbin/sshd -tf %') }
+        sshd_binary = case os_facts[:os]['family']
+                      when 'FreeBSD'
+                        '/usr/local/sbin/sshd'
+                      when 'Archlinux'
+                        '/usr/bin/sshd'
+                      else
+                        '/usr/sbin/sshd'
+                      end
+        it { is_expected.to contain_concat('/etc/ssh/sshd_config').with_validate_cmd("#{sshd_binary} -tf %") }
+      end
+
+      context 'with a different sshd_binary location' do
+        let :params do
+          {
+            validate_sshd_file: true,
+            sshd_binary: '/usr/another_bin/sshd'
+          }
+        end
+
+        it { is_expected.to contain_concat('/etc/ssh/sshd_config').with_validate_cmd('/usr/another_bin/sshd -tf %') }
       end
 
       context 'with a different sshd_config location' do