Ensure hostkey is created.

servo · Mar 6, 2018 · bdc772d · bdc772d
1 parent f6e3a4f
commit bdc772d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/admin/files/sshd_config b/admin/files/sshd_config
@@ -1,4 +1,4 @@
-HostKey /etc/ssh/ssh_host_ed25519_key
+HostKey /etc/ssh/{{ hostkey }}
 KexAlgorithms curve25519-sha256@libssh.org
 Ciphers chacha20-poly1305@openssh.com
 

diff --git a/admin/init.sls b/admin/init.sls
@@ -1,5 +1,5 @@
 {% from 'common/map.jinja' import root %}
-{% from tpldir ~ '/map.jinja' import admin %}
+{% from tpldir ~ '/map.jinja' import admin, hostkey %}
 
 admin-packages:
   pkg.installed:
@@ -31,6 +31,13 @@ sshd_config:
     - mode: 644
     - template: jinja
     - source: salt://{{ tpldir }}/files/sshd_config
+    - defaults:
+        hostkey: "{{ hostkey }}"
+  cmd.run:
+    - name: ssh-keygen -A
+    - runas: {{ root.user }}
+    - creates:
+      - /etc/ssh/{{ hostkey }}
 
 sshkeys-dir:
   file.directory:

diff --git a/admin/map.jinja b/admin/map.jinja
@@ -1,3 +1,6 @@
+{%
+  set hostkey = 'ssh_host_ed25519_key'
+%}
 {%
   set admin = {
     'ssh_users': [