Merge pull request #87 from smlloyd/master

Don't add sudo group by default.
This commit is contained in:
Forrest 2015-11-13 12:35:08 -08:00
commit 76f646ec06
2 changed files with 4 additions and 8 deletions

View File

@ -48,9 +48,11 @@ include:
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
users_{{ name }}_{{ group }}_group: users_{{ name }}_{{ group }}_group:
group: group.present:
- name: {{ group }} - name: {{ group }}
- present {% if group == 'sudo' %}
- system: True
{% endif %}
{% endfor %} {% endfor %}
users_{{ name }}_user: users_{{ name }}_user:

View File

@ -6,16 +6,10 @@ users_bash-package:
pkg.installed: pkg.installed:
- name: {{ users.bash_package }} - name: {{ users.bash_package }}
users_sudo-group:
group.present:
- name: sudo
- system: True
users_sudo-package: users_sudo-package:
pkg.installed: pkg.installed:
- name: {{ users.sudo_package }} - name: {{ users.sudo_package }}
- require: - require:
- group: users_sudo-group
- file: {{ users.sudoers_dir }} - file: {{ users.sudoers_dir }}
users_{{ users.sudoers_dir }}: users_{{ users.sudoers_dir }}: