1
0
Fork 0

Merge pull request #29 from irtnog/fix-visudo-path-freebsd

Use correct pathname of visudo on FreeBSD
This commit is contained in:
Brian Jackson 2016-03-09 23:57:15 -08:00
commit 93883cdcb6
3 changed files with 3 additions and 2 deletions

View File

@ -13,7 +13,7 @@ include:
- mode: 440
- template: jinja
- source: salt://sudoers/files/sudoers
- check_cmd: /usr/sbin/visudo -c -f
- check_cmd: {{ sudoers.get('exec-prefix', '/usr/sbin') }}/visudo -c -f
- context:
included: True
sudoers: {{ spec|json }}

View File

@ -11,7 +11,7 @@ sudo:
- mode: 440
- template: jinja
- source: salt://sudoers/files/sudoers
- check_cmd: /usr/sbin/visudo -c -f
- check_cmd: {{ sudoers.get('exec-prefix', '/usr/sbin') }}/visudo -c -f
- context:
included: False
- require:

View File

@ -11,5 +11,6 @@
'Suse': {'pkg': 'sudo'},
'FreeBSD': {'pkg': 'sudo',
'config-path': '/usr/local/etc',
'exec-prefix': '/usr/local/sbin',
'group': 'wheel'},
}, merge=salt['pillar.get']('sudoers:lookup')) %}