1
0
Fork 0
mirror of synced 2024-07-13 04:29:58 -04:00

added includedir as variable (mostly for FreeBSD)

include files can now be specified with the filename only.
This commit is contained in:
Jessy 2018-02-04 20:04:11 +01:00
parent 91d2af4de6
commit e4501d10d3
3 changed files with 9 additions and 1 deletions

View file

@ -45,6 +45,7 @@ sudoers:
users:
foo:
- 'ALL=(ALL) ALL'
extra-file-2:
groups:
bargroup:
- 'ALL=(ALL) NOPASSWD: ALL'

View file

@ -4,10 +4,16 @@ include:
- sudoers
{% do sudoers.update(pillar.get('sudoers', {})) %}
{% set includedir = sudoers.get('includedir', '/etc/sudoers.d') %}
{% set included_files = sudoers.get('included_files', {}) %}
{% for included_file,spec in included_files.items() -%}
{{ included_file }}:
sudoers include {{ included_file }}:
file.managed:
{% if '/' in included_file %}
- name: {{ included_file }}
{% else %}
- name: {{ includedir }}/{{ included_file }}
{% endif %}
- user: root
- group: {{ sudoers.get('group', 'root') }}
- mode: 440

View file

@ -11,6 +11,7 @@
'Suse': {'pkg': 'sudo'},
'FreeBSD': {'pkg': 'sudo',
'configpath': '/usr/local/etc',
'includedir': '/usr/local/etc/sudoers.d',
'execprefix': '/usr/local/sbin',
'group': 'wheel'},
}, merge=salt['pillar.get']('sudoers:lookup')) %}