Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
17a8ed9ae8
|
@ -13,6 +13,7 @@ include:
|
||||||
- mode: 440
|
- mode: 440
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source: salt://sudoers/files/sudoers
|
- source: salt://sudoers/files/sudoers
|
||||||
|
- check_cmd: {{ sudoers.get('exec-prefix', '/usr/sbin') }}/visudo -c -f
|
||||||
- context:
|
- context:
|
||||||
included: True
|
included: True
|
||||||
sudoers: {{ spec|json }}
|
sudoers: {{ spec|json }}
|
||||||
|
|
|
@ -11,6 +11,7 @@ sudo:
|
||||||
- mode: 440
|
- mode: 440
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source: salt://sudoers/files/sudoers
|
- source: salt://sudoers/files/sudoers
|
||||||
|
- check_cmd: {{ sudoers.get('exec-prefix', '/usr/sbin') }}/visudo -c -f
|
||||||
- context:
|
- context:
|
||||||
included: False
|
included: False
|
||||||
- require:
|
- require:
|
||||||
|
|
|
@ -11,5 +11,6 @@
|
||||||
'Suse': {'pkg': 'sudo'},
|
'Suse': {'pkg': 'sudo'},
|
||||||
'FreeBSD': {'pkg': 'sudo',
|
'FreeBSD': {'pkg': 'sudo',
|
||||||
'config-path': '/usr/local/etc',
|
'config-path': '/usr/local/etc',
|
||||||
|
'exec-prefix': '/usr/local/sbin',
|
||||||
'group': 'wheel'},
|
'group': 'wheel'},
|
||||||
}, merge=salt['pillar.get']('sudoers:lookup')) %}
|
}, merge=salt['pillar.get']('sudoers:lookup')) %}
|
||||||
|
|
Loading…
Reference in New Issue