Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2025-02-17 20:04:56 +01:00
Code Issues Activity

Nest defaults within users

Browse Source
This commit is contained in:
Siddhartha Sahu 2014-11-10 20:01:12 +05:30
parent 079a5361ea
commit bca0e23be9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
users/init.sls
View File

@ -2,7 +2,7 @@
{% from "users/map.jinja" import users with context %} {% from "users/map.jinja" import users with context %}
{% set used_sudo = False %} {% set used_sudo = False %}
{% set defaults = pillar.get('defaults', {}) %} {% set defaults = pillar.get('users', {}).get('defaults', {}) %}
{% for group in defaults.get('groups', []) %} {% for group in defaults.get('groups', []) %}
{{ group }}_group: {{ group }}_group:
@ -11,7 +11,7 @@
- present - present
{% endfor %} {% endfor %}
{% 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', {}).items() if (user.absent is not defined or not user.absent) and not name == 'defaults' %}
{%- if user == None -%} {%- if user == None -%}
{%- set user = {} -%} {%- set user = {} -%}
{%- endif -%} {%- endif -%}
@ -37,7 +37,7 @@
- name: {{ home }} - name: {{ home }}
- user: {{ name }} - user: {{ name }}
- group: {{ user_group }} - group: {{ user_group }}
- mode: {{ user.get('user_dir_mode', '0750') }} - mode: {{ user.get('user_dir_mode', defaults.get('user_dir_mode', '0750')) }}
- require: - require:
- user: {{ name }} - user: {{ name }}
- group: {{ user_group }} - group: {{ user_group }}
@ -104,6 +104,9 @@ user_keydir_{{ name }}:
{%- for group in user.get('groups', []) %} {%- for group in user.get('groups', []) %}
- group: {{ group }} - group: {{ group }}
{%- endfor %} {%- endfor %}
{%- for group in defaults.get('groups', []) %}
- group: {{ group }}
{%- endfor %}
{% 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') %}
@ -120,6 +123,9 @@ user_{{ name }}_private_key:
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
- group: {{ name }}_{{ group }}_group - group: {{ name }}_{{ group }}_group
{% endfor %} {% endfor %}
{% for group in defaults.get('groups', []) %}
- group: {{ name }}_{{ group }}_group
{% endfor %}
user_{{ name }}_public_key: user_{{ name }}_public_key:
file.managed: file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_type }}.pub - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/{{ key_type }}.pub
@ -133,6 +139,9 @@ user_{{ name }}_public_key:
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
- group: {{ name }}_{{ group }}_group - group: {{ name }}_{{ group }}_group
{% endfor %} {% endfor %}
{% for group in defaults.get('groups', []) %}
- group: {{ name }}_{{ group }}_group
{% endfor %}
{% endif %} {% endif %}