Moved the rsa/dsa key management to config.sls

This commit is contained in:
Seth House 2014-03-17 16:17:04 -06:00
parent 351a6b81dc
commit b44c26cd13
2 changed files with 39 additions and 40 deletions

View File

@ -14,3 +14,42 @@ sshd_config:
- watch_in: - watch_in:
- service: openssh - service: openssh
{% if salt['pillar.get']('openssh:provide_dsa_keys', False) %}
ssh_host_dsa_key:
file.managed:
- name: /etc/ssh/ssh_host_dsa_key
- contents_pillar: 'openssh:dsa:private_key'
- user: root
- mode: 600
- require_in:
- service: {{ openssh.service }}
ssh_host_dsa_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'
- user: root
- mode: 600
- require_in:
- service: {{ openssh.service }}
{% endif %}

View File

@ -8,43 +8,3 @@ openssh:
- name: {{ openssh.service }} - name: {{ openssh.service }}
- require: - require:
- pkg: {{ openssh.server }} - pkg: {{ openssh.server }}
{% if salt['pillar.get']('openssh:provide_dsa_keys', False) %}
- file: /etc/ssh/ssh_host_dsa_key
- file: /etc/ssh/ssh_host_dsa_key.pub
{% endif %}
{% if salt['pillar.get']('openssh:provide_rsa_keys', False) %}
- file: /etc/ssh/ssh_host_rsa_key
- file: /etc/ssh/ssh_host_rsa_key.pub
{% endif %}
{% if salt['pillar.get']('openssh:provide_dsa_keys', False) %}
ssh_host_dsa_key:
file.managed:
- name: /etc/ssh/ssh_host_dsa_key
- contents_pillar: 'openssh:dsa:private_key'
- user: root
- mode: 600
ssh_host_dsa_key.pub:
file.managed:
- name: /etc/ssh/ssh_host_dsa_key.pub
- contents_pillar: 'openssh:dsa:public_key'
- user: root
- mode: 600
{% 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
ssh_host_rsa_key.pub:
file.managed:
- name: /etc/ssh/ssh_host_rsa_key.pub
- contents_pillar: 'openssh:rsa:public_key'
- user: root
- mode: 600
{% endif %}