0
0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2024-12-02 20:57:15 +01:00

Merge pull request #77 from irtnog/add-managed-file-permissions-to-ssh_keys_pillar-states

Rework ssh_keys_pillar-related states
This commit is contained in:
puneet kandhari 2015-07-25 15:32:33 -05:00
commit 0e72cc20b9

View File

@ -177,19 +177,33 @@ users_ssh_auth_{{ name }}_{{ loop.index0 }}:
{% endif %} {% endif %}
{% if 'ssh_keys_pillar' in user %} {% if 'ssh_keys_pillar' in user %}
{% for key_name, pillar_name in user['ssh_keys_pillar'].iteritems() %} {% for key_name, pillar_name in user['ssh_keys_pillar'].items() %}
users_ssh_keys_files_{{ name }}_{{ key_name }}_pub: user_ssh_keys_files_{{ name }}_{{ key_name }}_private_key:
file.managed: file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_name - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_name }}
}}.pub - user: {{ name }}
- contents: | - group: {{ user_group }}
{{ pillar[pillar_name][key_name]['pubkey'] }} - mode: 600
users_ssh_keys_files_{{ name }}_{{ key_name }}_priv: - show_diff: False
- contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
- require:
- user: users_{{ name }}_user
{% for group in user.get('groups', []) %}
- group: users_{{ name }}_{{ group }}_group
{% endfor %}
user_ssh_keys_files_{{ name }}_{{ key_name }}_public_key:
file.managed: file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_name - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_name }}.pub
}} - user: {{ name }}
- contents: | - group: {{ user_group }}
{{ pillar[pillar_name][key_name]['privkey'] | indent(8) }} - mode: 644
- show_diff: False
- contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
- require:
- user: users_{{ name }}_user
{% for group in user.get('groups', []) %}
- group: users_{{ name }}_{{ group }}_group
{% endfor %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}