Merge pull request #63 from andrew-vant/auth_from_files

Added option to source ssh public keys from files.
This commit is contained in:
Forrest 2015-04-02 10:57:08 -07:00
commit d11e7046ec
2 changed files with 17 additions and 0 deletions

View File

@ -32,6 +32,11 @@ users:
# with the given keys
ssh_auth_file:
- PUBLICKEY
# If you prefer to keep public keys as files rather
# than inline in pillar, this works.
ssh_auth_sources:
- salt://keys/buser.id_rsa.pub
google_auth:
ssh: |
SOMEGAUTHHASHVAL

View File

@ -166,6 +166,18 @@ ssh_auth_{{ name }}_{{ loop.index0 }}:
{% endfor %}
{% endif %}
{% if 'ssh_auth_sources' in user %}
{% for pubkey_file in user['ssh_auth_sources'] %}
ssh_auth_source_{{ name }}_{{ loop.index0 }}:
ssh_auth.present:
- user: {{ name }}
- source: {{ pubkey_file }}
- require:
- file: {{ name }}_user
- user: {{ name }}_user
{% endfor %}
{% endif %}
{% if 'ssh_auth.absent' in user %}
{% for auth in user['ssh_auth.absent'] %}
ssh_auth_delete_{{ name }}_{{ loop.index0 }}: