add var ssh_host_keys_dir, for OSes with alternate host key locations

aqw · aqw · commit 4bb909d4e518 · 2020-06-23T09:47:23.000+02:00
Signed-off-by: Alex Waite &lt;alex@waite.eu&gt;
diff --git a/tasks/crypto.yml b/tasks/crypto.yml
@@ -1,17 +1,23 @@
 ---
 - name: set hostkeys according to openssh-version
   set_fact:
-    ssh_host_key_files: ['/etc/ssh/ssh_host_rsa_key', '/etc/ssh/ssh_host_ecdsa_key', '/etc/ssh/ssh_host_ed25519_key']
+    ssh_host_key_files:
+      - "{{ ssh_host_keys_dir }}/ssh_host_rsa_key"
+      - "{{ ssh_host_keys_dir }}/ssh_host_ecdsa_key"
+      - "{{ ssh_host_keys_dir }}/ssh_host_ed25519_key"
   when: sshd_version is version('6.3', '>=') and not ssh_host_key_files
 
 - name: set hostkeys according to openssh-version
   set_fact:
-    ssh_host_key_files: ['/etc/ssh/ssh_host_rsa_key', '/etc/ssh/ssh_host_ecdsa_key']
+    ssh_host_key_files:
+      - "{{ ssh_host_keys_dir }}/ssh_host_rsa_key"
+      - "{{ ssh_host_keys_dir }}/ssh_host_ecdsa_key"
   when: sshd_version is version('6.0', '>=') and not ssh_host_key_files
 
 - name: set hostkeys according to openssh-version
   set_fact:
-    ssh_host_key_files: ['/etc/ssh/ssh_host_rsa_key']
+    ssh_host_key_files:
+      - "{{ ssh_host_keys_dir }}/ssh_host_rsa_key"
   when: sshd_version is version('5.3', '>=') and not ssh_host_key_files
 
 ###
diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 sshd_service_name: ssh
 ssh_owner: root
 ssh_group: root
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/FreeBSD.yml b/vars/FreeBSD.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: wheel
diff --git a/vars/OpenBSD.yml b/vars/OpenBSD.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 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,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 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,5 @@
 sshd_path: /usr/sbin/sshd
+ssh_host_keys_dir: '/etc/ssh'
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
diff --git a/vars/SmartOS.yml b/vars/SmartOS.yml
@@ -1,4 +1,5 @@
 sshd_path: /usr/lib/ssh/sshd
+ssh_host_keys_dir: '/var/ssh'
 sshd_service_name: ssh
 ssh_owner: root
 ssh_group: root

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