Salt
/
sudoers-formula
mirror of https://github.com/saltstack-formulas/sudoers-formula.git
0
0
Fork 0
Code Issues Activity

feat(ordering): optionally append includefiles to main config

This commit is contained in:
noelmcloughlin 2021-08-19 00:05:27 +01:00
parent 25cd2cf0e3
commit 751eff7218
29 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/README.rst
View File

@ -51,7 +51,7 @@ Set up the sudoers file
``sudoers.included`` ``sudoers.included``
^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
Set up an additional sudoers included file Set up an additional sudoers included file.
Testing Testing

6
pillar.example
View File

@ -63,3 +63,9 @@ sudoers:
netgroups: netgroups:
other_netgroup: other_netgroup:
- 'ALL=(ALL) ALL' - 'ALL=(ALL) ALL'
# ordering is important. The sudoers manpage says when multiple
# entries match, the last match is used. However, if we do not
# manage the main config, our included files may not match last.
# To guarantee included files match last, set 'true' below to append
# each '#include <includefile>' to sudoers file.
append_included_files_to_endof_main_config: true

1
sudoers/defaults.yaml
View File

@ -10,3 +10,4 @@ sudoers:
execprefix: /usr/sbin execprefix: /usr/sbin
includedir: /etc/sudoers.d includedir: /etc/sudoers.d
included_files: {} included_files: {}
append_included_files_to_endof_main_config: false

5
sudoers/included/init.sls Normal file
View File

@ -0,0 +1,5 @@
# -*- coding: utf-8 -*-
# vim: ft=sls
include:
- .install

4
sudoers/included.sls → sudoers/included/install.sls
View File

@ -40,5 +40,9 @@ sudoers include {{ included_file }}:
- file: {{ sudoers.configpath }}/sudoers - file: {{ sudoers.configpath }}/sudoers
- require_in: - require_in:
- file: {{ sudoers.includedir }} - file: {{ sudoers.includedir }}
{% elif sudoers.append_included_files_to_endof_main_config %}
file.append:
- name: {{ sudoers.configpath }}/sudoers
- text: '#include {{ sudoers.configpath }}/sudoers.d/{{ included_file }}'
{% endif %} {% endif %}
{% endfor %} {% endfor %}

1
test/integration/default/files/_mapdata/almalinux-8.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/amazonlinux-1.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/amazonlinux-2.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/arch-base-latest.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/centos-6.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/centos-7.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/centos-8.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/debian-10.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/debian-11.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/debian-9.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/fedora-31.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/fedora-32.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/fedora-33.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/fedora-34.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/opensuse-15.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/oraclelinux-7.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/oraclelinux-8.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/rockylinux-8.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/ubuntu-16.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/ubuntu-18.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults:

1
test/integration/default/files/_mapdata/ubuntu-20.yaml
View File

@ -20,6 +20,7 @@ values:
- millert - millert
- dowdy - dowdy
- mikef - mikef
append_included_files_to_endof_main_config: false
arch: amd64 arch: amd64
configpath: /etc configpath: /etc
defaults: defaults: