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

Use correct pathname of visudo on FreeBSD
8 years ago · 93883cdcb6
parent f46d2ca228 672cd20672
commit 93883cdcb6
3 changed files with 3 additions and 2 deletions
--- a/sudoers/included.sls
+++ b/sudoers/included.sls
@ -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 }}
--- a/sudoers/init.sls
+++ b/sudoers/init.sls
@ -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:
--- a/sudoers/map.jinja
+++ b/sudoers/map.jinja
@ -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')) %}