浏览代码

Merge pull request #87 from smlloyd/master

Don't add sudo group by default.
tags/v0.45.0
Forrest 9 年前
父节点
当前提交
76f646ec06
共有 2 个文件被更改,包括 4 次插入8 次删除
  1. +4
    -2
      users/init.sls
  2. +0
    -6
      users/sudo.sls

+ 4
- 2
users/init.sls 查看文件

@@ -48,9 +48,11 @@ include:

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

users_{{ name }}_user:

+ 0
- 6
users/sudo.sls 查看文件

@@ -6,16 +6,10 @@ users_bash-package:
pkg.installed:
- name: {{ users.bash_package }}

users_sudo-group:
group.present:
- name: sudo
- system: True

users_sudo-package:
pkg.installed:
- name: {{ users.sudo_package }}
- require:
- group: users_sudo-group
- file: {{ users.sudoers_dir }}

users_{{ users.sudoers_dir }}:

正在加载...
取消
保存