Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2025-03-11 09:24:46 +01:00
Code Issues Activity

Dependency for ssh_auth are correctly managed when home is not created by the formula.

Browse Source
This commit is contained in:
adnanJP 2016-07-01 08:14:28 +02:00 committed by GitHub
parent 108f09252e
commit f334203223
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
users/init.sls
View File

@ -48,11 +48,9 @@ include:
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
users_{{ name }}_{{ group }}_group: users_{{ name }}_{{ group }}_group:
group.present: group:
- name: {{ group }} - name: {{ group }}
{% if group == 'sudo' %} - present
- system: True
{% endif %}
{% endfor %} {% endfor %}
users_{{ name }}_user: users_{{ name }}_user:
@ -113,17 +111,7 @@ users_{{ name }}_user:
- createhome: False - createhome: False
{% endif %} {% endif %}
{% if 'expire' in user -%} {% if 'expire' in user -%}
{% if grains['kernel'].endswith('BSD') and
user['expire'] < 157766400 %}
{# 157762800s since epoch equals 01 Jan 1975 00:00:00 UTC #}
- expire: {{ user['expire'] * 86400 }}
{% elif grains['kernel'] == 'Linux' and
user['expire'] > 84006 %}
{# 2932896 days since epoch equals 9999-12-31 #}
- expire: {{ (user['expire'] / 86400) | int}}
{% else %}
- expire: {{ user['expire'] }} - expire: {{ user['expire'] }}
{% endif %}
{% endif -%} {% endif -%}
- remove_groups: {{ user.get('remove_groups', 'False') }} - remove_groups: {{ user.get('remove_groups', 'False') }}
- groups: - groups:
@ -141,7 +129,6 @@ users_{{ name }}_user:
{% if 'ssh_keys' in user or {% if 'ssh_keys' in user or
'ssh_auth' in user or 'ssh_auth' in user or
'ssh_auth_file' in user or 'ssh_auth_file' in user or
'ssh_auth_pillar' in user or
'ssh_auth.absent' in user or 'ssh_auth.absent' in user or
'ssh_config' in user %} 'ssh_config' in user %}
user_keydir_{{ name }}: user_keydir_{{ name }}:
@ -196,7 +183,7 @@ users_authorized_keys_{{ name }}:
file.managed: file.managed:
- name: {{ home }}/.ssh/authorized_keys - name: {{ home }}/.ssh/authorized_keys
- user: {{ name }} - user: {{ name }}
- group: {{ user_group }} - group: {{ name }}
- mode: 600 - mode: 600
{% if 'ssh_auth_file' in user %} {% if 'ssh_auth_file' in user %}
- contents: | - contents: |
@ -263,7 +250,7 @@ users_ssh_auth_source_{{ name }}_{{ loop.index0 }}:
- user: {{ name }} - user: {{ name }}
- source: {{ pubkey_file }} - source: {{ pubkey_file }}
- require: - require:
- file: users_{{ name }}_user - file: user_keydir_{{ name }}
- user: users_{{ name }}_user - user: users_{{ name }}_user
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -389,10 +376,10 @@ users_{{ users.sudoers_dir }}/{{ name }}:
- require: - require:
- file: users_sudoer-defaults - file: users_sudoer-defaults
- file: users_sudoer-{{ name }} - file: users_sudoer-{{ name }}
cmd.wait: cmd.wait:
- name: visudo -cf {{ users.sudoers_dir }}/{{ name }} || ( rm -rvf {{ users.sudoers_dir }}/{{ name }}; exit 1 ) - name: visudo -cf {{ users.sudoers_dir }}/{{ name }} || ( rm -rvf {{ users.sudoers_dir }}/{{ name }}; exit 1 )
- watch: - watch:
- file: {{ users.sudoers_dir }}/{{ name }} - file: {{ users.sudoers_dir }}/{{ name }}
{% endif %} {% endif %}
{% else %} {% else %}
users_{{ users.sudoers_dir }}/{{ name }}: users_{{ users.sudoers_dir }}/{{ name }}:
@ -416,11 +403,6 @@ users_googleauth-{{ svc }}-{{ name }}:
{%- endif %} {%- endif %}
{% if 'gitconfig' in user %} {% if 'gitconfig' in user %}
{% if not salt['cmd.has_exec']('git') %}
skip_{{ name }}_gitconfig_since_git_not_installed:
test.fail_without_changes:
- name: "Git configuration for user {{ name }} has been skipped because Git is not installed."
{% else %}
{% for key, value in user['gitconfig'].items() %} {% for key, value in user['gitconfig'].items() %}
users_{{ name }}_user_gitconfig_{{ loop.index0 }}: users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
{% if grains['saltversioninfo'] >= (2015, 8, 0, 0) %} {% if grains['saltversioninfo'] >= (2015, 8, 0, 0) %}
@ -438,7 +420,6 @@ users_{{ name }}_user_gitconfig_{{ loop.index0 }}:
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %}
{% endfor %} {% endfor %}