Merge pull request #19 from arillso/fixed/path

fixed path
arillso · Sep 14, 2020 · 3f0d10a · 3f0d10a
2 parents 4f16772 + 0a71347
commit 3f0d10a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.2.1
+
+### Fixed
+
+- Fixed Windows path
+
 ## 2.2.0
 
 ### Added

diff --git a/tasks/distribution/subtasks/crypto.yml b/tasks/distribution/subtasks/crypto.yml
@@ -5,21 +5,24 @@
   set_fact:
     ssh_host_key_files:
       [
-        '/etc/ssh/ssh_host_rsa_key',
-        '/etc/ssh/ssh_host_ecdsa_key',
-        '/etc/ssh/ssh_host_ed25519_key',
+        '{{ sshd_config_path }}/ssh_host_rsa_key',
+        '{{ sshd_config_path }}/ssh_host_ecdsa_key',
+        '{{ sshd_config_path }}/ssh_host_ed25519_key',
       ]
   when: sshd_version.stdout >= '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']
+      [
+        '{{ sshd_config_path }}/ssh_host_rsa_key',
+        '{{ sshd_config_path }}/ssh_host_ecdsa_key',
+      ]
   when: sshd_version.stdout >= '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: ['{{ sshd_config_path }}/ssh_host_rsa_key']
   when: sshd_version.stdout >= '5.3' and not ssh_host_key_files
 
 - name: set macs according to openssh-version if openssh >= 7.6