From ce46343562a89ea5b8b1b5bc8ae75d1859507965 Mon Sep 17 00:00:00 2001
From: Alan Pearce <ap@studio-40.com>
Date: Sun, 24 Aug 2014 11:50:36 +0100
Subject: [PATCH] Config: Refactor host key provisioning into loop

---
 openssh/config.sls | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/openssh/config.sls b/openssh/config.sls
index 857eecd..a42fcd1 100644
--- a/openssh/config.sls
+++ b/openssh/config.sls
@@ -13,42 +13,24 @@ sshd_config:
     - watch_in:
       - service: openssh
 
-{% if salt['pillar.get']('openssh:provide_dsa_keys', False) %}
-ssh_host_dsa_key:
+{% for keyType in ['dsa', 'rsa'] %}
+{% if salt['pillar.get']('openssh:provide_' ~ keyType ~ '_keys', False) %}
+ssh_host_{{ keyType }}_key:
   file.managed:
-    - name: /etc/ssh/ssh_host_dsa_key
-    - contents_pillar: 'openssh:dsa:private_key'
+    - name: /etc/ssh/ssh_host_{{ keyType }}_key
+    - contents_pillar: 'openssh:{{ keyType }}:private_key'
     - user: root
     - mode: 600
     - require_in:
       - service: {{ openssh.service }}
 
-ssh_host_dsa_key.pub:
+ssh_host_{{ keyType }}_key.pub:
   file.managed:
-    - name: /etc/ssh/ssh_host_dsa_key.pub
-    - contents_pillar: 'openssh:dsa:public_key'
-    - user: root
-    - mode: 600
-    - require_in:
-      - service: {{ openssh.service }}
-{% endif %}
-
-{% if salt['pillar.get']('openssh:provide_rsa_keys', False) %}
-ssh_host_rsa_key:
-  file.managed:
-    - name: /etc/ssh/ssh_host_rsa_key
-    - contents_pillar: 'openssh:rsa:private_key'
-    - user: root
-    - mode: 600
-    - require_in:
-      - service: {{ openssh.service }}
-
-ssh_host_rsa_key.pub:
-  file.managed:
-    - name: /etc/ssh/ssh_host_rsa_key.pub
-    - contents_pillar: 'openssh:rsa:public_key'
+    - name: /etc/ssh/ssh_host_{{ keyType }}_key.pub
+    - contents_pillar: 'openssh:{{ keyType }}:public_key'
     - user: root
     - mode: 600
     - require_in:
       - service: {{ openssh.service }}
 {% endif %}
+{% endfor %}
\ No newline at end of file