saltstack-formulas/users-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76 from pcdummy/master

Browse Source 
Some smaller changes.
This commit is contained in:
puneet kandhari 2015-07-13 07:24:35 -05:00
commit 001e913e77
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
users/init.sls
View File

@ -3,7 +3,7 @@
{% set used_sudo = [] %} {% set used_sudo = [] %}
{% set used_googleauth = [] %} {% set used_googleauth = [] %}
{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %} {%- for name, user in pillar.get('users', {}).iteritems() if user.absent is not defined or not user.absent %}
{%- if user == None -%} {%- if user == None -%}
{%- set user = {} -%} {%- set user = {} -%}
{%- endif -%} {%- endif -%}
@ -25,7 +25,7 @@ include:
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %} {% for name, user in pillar.get('users', {}).iteritems() if user.absent is not defined or not user.absent %}
{%- if user == None -%} {%- if user == None -%}
{%- set user = {} -%} {%- set user = {} -%}
{%- endif -%} {%- endif -%}
@ -52,7 +52,7 @@ users_{{ name }}_user:
- group: {{ user_group }} - group: {{ user_group }}
- mode: {{ user.get('user_dir_mode', '0750') }} - mode: {{ user.get('user_dir_mode', '0750') }}
- require: - require:
- user: {{ name }} - user: users_{{ name }}_user
- group: {{ user_group }} - group: {{ user_group }}
{%- endif %} {%- endif %}
group.present: group.present:
@ -72,6 +72,9 @@ users_{{ name }}_user:
{% if 'password' in user -%} {% if 'password' in user -%}
- password: '{{ user['password'] }}' - password: '{{ user['password'] }}'
{% endif -%} {% endif -%}
{% if user.get('system', False) -%}
- system: True
{% endif -%}
{% if 'prime_group' in user and 'gid' in user['prime_group'] -%} {% if 'prime_group' in user and 'gid' in user['prime_group'] -%}
- gid: {{ user['prime_group']['gid'] }} - gid: {{ user['prime_group']['gid'] }}
{% else -%} {% else -%}
@ -98,7 +101,9 @@ users_{{ name }}_user:
- group: {{ group }} - group: {{ group }}
{% endfor %} {% endfor %}
users_user_keydir_{{ name }}:
{% if 'ssh_keys' in user or 'ssh_auth' in user or 'ssh_auth.absent' in user %}
user_keydir_{{ name }}:
file.directory: file.directory:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh
- user: {{ name }} - user: {{ name }}
@ -111,6 +116,7 @@ users_user_keydir_{{ name }}:
{%- for group in user.get('groups', []) %} {%- for group in user.get('groups', []) %}
- group: {{ group }} - group: {{ group }}
{%- endfor %} {%- endfor %}
{% endif %}
{% if 'ssh_keys' in user %} {% if 'ssh_keys' in user %}
{% set key_type = 'id_' + user.get('ssh_key_type', 'rsa') %} {% set key_type = 'id_' + user.get('ssh_key_type', 'rsa') %}
@ -306,7 +312,8 @@ users_googleauth-{{ svc }}-{{ name }}:
{% endfor %} {% endfor %}
{% for name, user in pillar.get('users', {}).items() if user.absent is defined and user.absent %}
{% for name, user in pillar.get('users', {}).iteritems() if user.absent is defined and user.absent %}
users_absent_user_{{ name }}: users_absent_user_{{ name }}:
{% if 'purge' in user or 'force' in user %} {% if 'purge' in user or 'force' in user %}
user.absent: user.absent:
@ -339,4 +346,3 @@ users_absent_group_{{ group }}:
group.absent: group.absent:
- name: {{ group }} - name: {{ group }}
{% endfor %} {% endfor %}