psi-jack/formula-sudoers
1
0
Fork 0
mirror of synced 2024-11-22 08:45:35 -05:00
Code Issues Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sudoers/included.sls
View file

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

2
sudoers/init.sls
View file

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

1
sudoers/map.jinja
View file

@ -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')) %}