From 5f6395fc43ff2bbb32df0b3825714dcb59facb9f Mon Sep 17 00:00:00 2001 From: Jason Wolfe Date: Mon, 13 Oct 2014 23:15:30 -0700 Subject: [PATCH] FreeBSD support with group 0 being wheel, clean up config-path --- sudoers/included.sls | 2 +- sudoers/init.sls | 2 +- sudoers/package-map.jinja | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sudoers/included.sls b/sudoers/included.sls index 1577730..8ad4263 100644 --- a/sudoers/included.sls +++ b/sudoers/included.sls @@ -9,7 +9,7 @@ include: {{ included_file }}: file.managed: - user: root - - group: root + - group: {{ pkgs.get('group', 'root') }} - mode: 440 - template: jinja - source: salt://sudoers/files/sudoers diff --git a/sudoers/init.sls b/sudoers/init.sls index 8f73c12..af5af86 100644 --- a/sudoers/init.sls +++ b/sudoers/init.sls @@ -7,7 +7,7 @@ sudo: {{ pkgs.get('config-path', '/etc') }}/sudoers: file.managed: - user: root - - group: root + - group: {{ pkgs.get('group', 'root') }} - mode: 440 - template: jinja - source: salt://sudoers/files/sudoers diff --git a/sudoers/package-map.jinja b/sudoers/package-map.jinja index bdbfd12..0961d07 100644 --- a/sudoers/package-map.jinja +++ b/sudoers/package-map.jinja @@ -8,7 +8,8 @@ 'Gentoo': {'sudo': 'app-admin/sudo'}, 'Mint': {'sudo': 'sudo'}, 'FreeBSD': {'sudo': 'sudo', - 'config-path': '/usr/local/etc/'} + 'config-path': '/usr/local/etc', + 'group': 'wheel'} } %} {% if 'package_table' in pillar %}