Salt
/
users-formula
mirror of https://github.com/saltstack-formulas/users-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #42 from TimJones/master 

Only include users.sudo when a user with sudouser is declared.
This commit is contained in:
Forrest 2014-07-28 14:51:17 -07:00
parent 76610eb63e 8a07ab1332
commit 93e3c15096
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
users/init.sls
View File

@ -1,8 +1,6 @@
# vim: sts=2 ts=2 sw=2 et ai # vim: sts=2 ts=2 sw=2 et ai
{% from "users/map.jinja" import users with context %} {% from "users/map.jinja" import users with context %}
{% set used_sudo = False %}
include:
- users.sudo
{% 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 %}
{%- if user == None -%} {%- if user == None -%}
@ -127,6 +125,12 @@ ssh_auth_{{ name }}_{{ loop.index0 }}:
{% if 'sudouser' in user and user['sudouser'] %} {% if 'sudouser' in user and user['sudouser'] %}
{% if not used_sudo %}
{% set used_sudo = True %}
include:
- users.sudo
{% endif %}
sudoer-{{ name }}: sudoer-{{ name }}:
file.managed: file.managed:
- name: {{ users.sudoers_dir }}{{ name }} - name: {{ users.sudoers_dir }}{{ name }}