Merge pull request #13 from accumulo/master

Add and support ssh_key_type attribute to allow for dsa ssh key pairs
This commit is contained in:
Joseph Hall 2014-01-31 14:17:09 -08:00
commit 4d9fb60715
2 changed files with 4 additions and 2 deletions

View File

@ -17,6 +17,7 @@ users:
gid: 500
groups:
- users
ssh_key_type: rsa
ssh_keys:
privkey: PRIVATEKEY
pubkey: PUBLICKEY

View File

@ -77,9 +77,10 @@ user_keydir_{{ name }}:
{%- endfor %}
{% if 'ssh_keys' in user %}
{% set key_type = 'id_' + user.get('ssh_key_type', 'rsa') %}
user_{{ name }}_private_key:
file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/id_rsa
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_type }}
- user: {{ name }}
- group: {{ user_group }}
- mode: 600
@ -91,7 +92,7 @@ user_{{ name }}_private_key:
{% endfor %}
user_{{ name }}_public_key:
file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/id_rsa.pub
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_type }}.pub
- user: {{ name }}
- group: {{ user_group }}
- mode: 644