Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2024-11-27 22:38:34 +01:00
Code Issues Activity

Skips user if it's enabled without a specified source, and their directory does not exist.

Browse Source
This commit is contained in:
Shane Poage 2015-08-21 15:52:36 -05:00
parent cdb862e968
commit b986e1e7f2
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
users/init.sls
View File

@ -15,7 +15,7 @@
{%- if 'google_auth' in user %}
{%- do used_googleauth.append(1) %}
{%- endif %}
{%- if pillar.get('users:' + name + ':user_files:enabled', False) %}
{%- if salt['pillar.get']('users:' ~ name ~ ':user_files:enabled', False) %}
{%- do used_user_files.append(1) %}
{%- endif %}
{%- endfor %}

32
users/user_files.sls
View File

@ -3,22 +3,29 @@
include:
- users
{%- for username, user in pillar.get('users', {}).items() if (user.absent is not defined or not user.absent) -%}
{%- set user_files = pillar.get('users:' + username + ':user_files', {'enabled': False}) -%}
{% set userfile_dirs = salt['cp.list_master_dirs'](prefix='users/files/user/') -%}
{%- for username, user in salt['pillar.get']('users', {}).items() if (user.absent is not defined or not user.absent) -%}
{%- set user_files = salt['pillar.get'](('users:' ~ username ~ ':user_files'), {'enabled': False}) -%}
{%- set user_group = salt['pillar.get'](('users:' ~ username ~ ':prime_group:name'), username) -%}
{%- if user_files.enabled -%}
{%- set user_group = pillar.get(('users:' + username + ':prime_group:name'), username) -%}
{%- if user_files.source is defined -%}
{%- if user_files.source.startswith('salt://') -%}
{%- set file_source = user_files.source -%}
{%- if user_files.source.startswith('salt://') -%}
{%- set file_source = user_files.source -%}
{%- else -%}
{%- set file_source = ('salt://' ~ user.user_files.source) -%}
{%- endif -%}
{%- set skip_user = False -%}
{%- else -%}
{%- set file_source = ('salt://' + user.user_files.source) -%}
{%- endif -%}
{%- else -%}
{%- set file_source = ('salt://users/files/user/' + username) -%}
{%- if ('users/files/user/' ~ username) in userfile_dirs -%}
{%- set file_source = ('salt://users/files/user/' ~ username) -%}
{%- set skip_user = False -%}
{%- else -%}
{%- set skip_user = True -%}
{%- endif -%}
{%- endif -%}
{%- if not skip_user %}
users_userfiles_{{ username }}_recursive:
file.recurse:
- name: {{ user.home }}
@ -31,6 +38,7 @@ users_userfiles_{{ username }}_recursive:
- require:
- user: users_{{ username }}_user
- file: users_{{ username }}_user
{% endif -%}
{% endfor -%}
{%- endif -%}
{%- endfor -%}