Merge pull request #26 from slawekp/master
New format of handling user.absent, supporting additional parameters
This commit is contained in:
commit
7cefc9e601
@ -1,10 +1,9 @@
|
||||
users:
|
||||
## Minimal required pillar values
|
||||
## Minimal required pillar values
|
||||
auser:
|
||||
groups:
|
||||
- admin
|
||||
fullname: A User
|
||||
|
||||
## Full list of pillar values
|
||||
## Full list of pillar values
|
||||
buser:
|
||||
fullname: B User
|
||||
home: /custom/buser
|
||||
@ -25,6 +24,14 @@ users:
|
||||
ssh_auth:
|
||||
- PUBLICKEY
|
||||
|
||||
## Absent user
|
||||
cuser:
|
||||
absent: True
|
||||
purge: True
|
||||
force: True
|
||||
|
||||
|
||||
## Old syntax of absent_users still supported
|
||||
absent_users:
|
||||
- donald
|
||||
- bad_guy
|
||||
|
@ -1,7 +1,7 @@
|
||||
include:
|
||||
- users.sudo
|
||||
|
||||
{% for name, user in pillar.get('users', {}).items() %}
|
||||
{% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
|
||||
{%- if user == None -%}
|
||||
{%- set user = {} -%}
|
||||
{%- endif -%}
|
||||
@ -105,8 +105,8 @@ user_{{ name }}_public_key:
|
||||
{% endif %}
|
||||
|
||||
|
||||
{% if 'ssh_auth' in user %}
|
||||
{% for auth in user['ssh_auth'] %}
|
||||
{% if 'ssh_auth' in user %}
|
||||
{% for auth in user['ssh_auth'] %}
|
||||
ssh_auth_{{ name }}_{{ loop.index0 }}:
|
||||
ssh_auth.present:
|
||||
- user: {{ name }}
|
||||
@ -144,6 +144,24 @@ sudoer-{{ name }}:
|
||||
|
||||
{% endfor %}
|
||||
|
||||
{% for name, user in pillar.get('users', {}).items() if user.absent is defined and user.absent %}
|
||||
{{ name }}:
|
||||
{% if 'purge' in user or 'force' in user %}
|
||||
user.absent:
|
||||
{% if 'purge' in user %}
|
||||
- purge: {{ user['purge'] }}
|
||||
{% endif %}
|
||||
{% if 'force' in user %}
|
||||
- force: {{ user['force'] }}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
user.absent
|
||||
{% endif -%}
|
||||
/etc/sudoers.d/{{ name }}:
|
||||
file.absent:
|
||||
- name: /etc/sudoers.d/{{ name }}
|
||||
{% endfor %}
|
||||
|
||||
{% for user in pillar.get('absent_users', []) %}
|
||||
{{ user }}:
|
||||
user.absent
|
||||
|
Loading…
Reference in New Issue
Block a user