diff --git a/users/init.sls b/users/init.sls index 099a8f0..a1bb4a0 100644 --- a/users/init.sls +++ b/users/init.sls @@ -178,7 +178,7 @@ user_keydir_{{ name }}: {% else %} {% set key_name = _key %} {% endif %} -users_{{ name }}_{{ key_name }}_private_key: +users_{{ name }}_{{ key_name }}_key: file.managed: - name: {{ home }}/.ssh/{{ key_name }} - user: {{ name }} @@ -191,19 +191,6 @@ users_{{ name }}_{{ key_name }}_private_key: {% for group in user.get('groups', []) %} - group: users_{{ name }}_{{ group }}_group {% endfor %} -users_{{ name }}_{{ key_name }}_public_key: - file.managed: - - name: {{ home }}/.ssh/{{ key_name }} - - user: {{ name }} - - group: {{ user_group }} - - mode: 644 - - show_diff: False - - contents_pillar: users:{{ name }}:ssh_keys:{{ _key }} - - require: - - user: users_{{ name }}_user - {% for group in user.get('groups', []) %} - - group: users_{{ name }}_{{ group }}_group - {% endfor %} {% endfor %} {% endif %}