Merge pull request #44 from elfixit/master

add options to give a key size to generate_key

openssh/config.sls

@@ -17,7 +17,12 @@ sshd_config:
 {% if salt['pillar.get']('openssh:generate_' ~ keyType ~ '_keys', False) %}
 ssh_generate_host_{{ keyType }}_key:
   cmd.run:
+    {%- if salt['pillar.get']('openssh:generate_' ~ keyType ~ '_size', False) %}
+    {%- set keySize = salt['pillar.get']('openssh:generate_' ~ keyType ~ '_size', 4096) %}
+    - name: ssh-keygen -t {{ keyType }} -b {{ keySize }} -N '' -f /etc/ssh/ssh_host_{{ keyType }}_key
+    {%- else %}
     - name: ssh-keygen -t {{ keyType }} -N '' -f /etc/ssh/ssh_host_{{ keyType }}_key
+    {%- endif %}
     - creates: /etc/ssh/ssh_host_{{ keyType }}_key
     - user: root
 

pillar.example

@@ -91,6 +91,7 @@ openssh:
       ecdsa-sha2-nistp256 NOT_DEFINED
 
   generate_rsa_keys: False
+  generate_rsa_size: 4096
   absent_rsa_keys: False
   provide_rsa_keys: False
   rsa: