Merge pull request #17 from cornmander/fixed-pubkey-privkey-contents
Changed 'contents' to 'contents_pillar' to correctly parse newlines for private/public SSH keys.
This commit is contained in:
commit
56ca792f84
@ -84,7 +84,7 @@ user_{{ name }}_private_key:
|
|||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 600
|
- mode: 600
|
||||||
- contents: {{ user['ssh_keys']['privkey'] }}
|
- contents_pillar: users:{{ name }}:ssh_keys:privkey
|
||||||
- require:
|
- require:
|
||||||
- user: {{ name }}_user
|
- user: {{ name }}_user
|
||||||
{% for group in user.get('groups', []) %}
|
{% for group in user.get('groups', []) %}
|
||||||
@ -96,7 +96,7 @@ user_{{ name }}_public_key:
|
|||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 644
|
- mode: 644
|
||||||
- contents: {{ user['ssh_keys']['pubkey'] }}
|
- contents_pillar: users:{{ name }}:ssh_keys:privkey
|
||||||
- require:
|
- require:
|
||||||
- user: {{ name }}_user
|
- user: {{ name }}_user
|
||||||
{% for group in user.get('groups', []) %}
|
{% for group in user.get('groups', []) %}
|
||||||
|
Loading…
Reference in New Issue
Block a user