add var sshd_path, for OSs with alternate sshd locations

aqw · aqw · commit fa4bc6b8cc99 · 2020-06-20T13:46:15.000+02:00
Signed-off-by: Alex Waite &lt;alex@waite.eu&gt;
diff --git a/tasks/hardening.yml b/tasks/hardening.yml
@@ -37,7 +37,7 @@
     mode: '0600'
     owner: '{{ ssh_owner }}'
     group: '{{ ssh_group }}'
-    validate: '/usr/sbin/sshd -T -C user=root -C host=localhost -C addr=localhost -C lport=22 -f %s'
+    validate: '{{ sshd_path }} -T -C user=root -C host=localhost -C addr=localhost -C lport=22 -f %s'
   notify: restart sshd
   when: ssh_server_hardening | bool
 
diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
@@ -1,3 +1,4 @@
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: ssh
 ssh_owner: root
 ssh_group: root
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/FreeBSD.yml b/vars/FreeBSD.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: wheel
diff --git a/vars/OpenBSD.yml b/vars/OpenBSD.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: wheel
diff --git a/vars/Oracle Linux.yml b/vars/Oracle Linux.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
@@ -1,4 +1,4 @@
----
+sshd_path: /usr/sbin/sshd
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`----`
	`1`	`+sshd_path: /usr/sbin/sshd`
`2`	`2`	`sshd_service_name: ssh`
`3`	`3`	`ssh_owner: root`
`4`	`4`	`ssh_group: root`