Merge pull request #15 from JaseFace/master
FreeBSD support with group 0 being wheel, clean up config-path
This commit is contained in:
commit
4e579839c5
3 changed files with 4 additions and 3 deletions
|
@ -9,7 +9,7 @@ include:
|
||||||
{{ included_file }}:
|
{{ included_file }}:
|
||||||
file.managed:
|
file.managed:
|
||||||
- user: root
|
- user: root
|
||||||
- group: root
|
- group: {{ pkgs.get('group', 'root') }}
|
||||||
- mode: 440
|
- mode: 440
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source: salt://sudoers/files/sudoers
|
- source: salt://sudoers/files/sudoers
|
||||||
|
|
|
@ -7,7 +7,7 @@ sudo:
|
||||||
{{ pkgs.get('config-path', '/etc') }}/sudoers:
|
{{ pkgs.get('config-path', '/etc') }}/sudoers:
|
||||||
file.managed:
|
file.managed:
|
||||||
- user: root
|
- user: root
|
||||||
- group: root
|
- group: {{ pkgs.get('group', 'root') }}
|
||||||
- mode: 440
|
- mode: 440
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source: salt://sudoers/files/sudoers
|
- source: salt://sudoers/files/sudoers
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
'Gentoo': {'sudo': 'app-admin/sudo'},
|
'Gentoo': {'sudo': 'app-admin/sudo'},
|
||||||
'Mint': {'sudo': 'sudo'},
|
'Mint': {'sudo': 'sudo'},
|
||||||
'FreeBSD': {'sudo': 'sudo',
|
'FreeBSD': {'sudo': 'sudo',
|
||||||
'config-path': '/usr/local/etc/'}
|
'config-path': '/usr/local/etc',
|
||||||
|
'group': 'wheel'}
|
||||||
} %}
|
} %}
|
||||||
|
|
||||||
{% if 'package_table' in pillar %}
|
{% if 'package_table' in pillar %}
|
||||||
|
|
Loading…
Reference in a new issue