mirror of
https://github.com/saltstack-formulas/sudoers-formula.git
synced 2026-09-19 09:14:43 +02:00
refactor: change pillar calls
This commit is contained in:
@@ -3,3 +3,9 @@
|
||||
---
|
||||
sudoers:
|
||||
pkg: sudo
|
||||
manage_main_config: true
|
||||
configpath: /etc
|
||||
group: root
|
||||
execprefix: /usr/sbin
|
||||
includedir: /etc/sudoers.d
|
||||
included_files: {}
|
||||
|
||||
+14
-10
@@ -1,31 +1,35 @@
|
||||
{% from "sudoers/map.jinja" import sudoers with context %}
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- set sls_config_file = tplroot ~ '.config.file' %}
|
||||
{%- from tplroot ~ "/map.jinja" import sudoers with context %}
|
||||
|
||||
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() -%}
|
||||
{% set included_files = sudoers.included_files %}
|
||||
{% for included_file, spec in included_files.items() -%}
|
||||
sudoers include {{ included_file }}:
|
||||
file.managed:
|
||||
{% if '/' in included_file %}
|
||||
- name: {{ included_file }}
|
||||
{% else %}
|
||||
- name: {{ includedir }}/{{ included_file }}
|
||||
- name: {{ sudoers.includedir }}/{{ included_file }}
|
||||
{% endif %}
|
||||
- user: root
|
||||
- group: {{ sudoers.get('group', 'root') }}
|
||||
- group: {{ sudoers.group }}
|
||||
- mode: 440
|
||||
- makedirs: True
|
||||
- template: jinja
|
||||
- source: salt://sudoers/files/sudoers
|
||||
- check_cmd: {{ sudoers.get('execprefix', '/usr/sbin') }}/visudo -c -f
|
||||
- check_cmd: {{ sudoers.execprefix }}/visudo -c -f
|
||||
- context:
|
||||
included: True
|
||||
sudoers: {{ spec|json }}
|
||||
{% if salt['pillar.get']('sudoers:manage_main_config', True) %}
|
||||
{% if sudoers.manage_main_config %}
|
||||
- require:
|
||||
- file: {{ sudoers.get('configpath', '/etc') }}/sudoers
|
||||
- file: {{ sudoers.configpath }}/sudoers
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
+12
-6
@@ -1,19 +1,25 @@
|
||||
{% from "sudoers/map.jinja" import sudoers with context %}
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=sls
|
||||
|
||||
{#- Get the `tplroot` from `tpldir` #}
|
||||
{%- set tplroot = tpldir.split('/')[0] %}
|
||||
{%- set sls_config_file = tplroot ~ '.config.file' %}
|
||||
{%- from tplroot ~ "/map.jinja" import sudoers with context %}
|
||||
|
||||
sudo:
|
||||
pkg.installed:
|
||||
- name: {{ sudoers.pkg }}
|
||||
|
||||
{% if salt['pillar.get']('sudoers:manage_main_config', True) %}
|
||||
{% if sudoers.manage_main_config %}
|
||||
|
||||
{{ sudoers.get('configpath', '/etc') }}/sudoers:
|
||||
{{ sudoers.configpath }}/sudoers:
|
||||
file.managed:
|
||||
- user: root
|
||||
- group: {{ sudoers.get('group', 'root') }}
|
||||
- group: {{ sudoers.group }}
|
||||
- mode: 440
|
||||
- template: jinja
|
||||
- source: salt://sudoers/files/sudoers
|
||||
- check_cmd: {{ sudoers.get('execprefix', '/usr/sbin') }}/visudo -c -f
|
||||
- check_cmd: {{ sudoers.execprefix }}/visudo -c -f
|
||||
- context:
|
||||
included: False
|
||||
- require:
|
||||
@@ -21,7 +27,7 @@ sudo:
|
||||
|
||||
{% else %}
|
||||
|
||||
{{ sudoers.get('configpath', '/etc') }}/sudoers:
|
||||
{{ sudoers.configpath }}/sudoers:
|
||||
test.show_notification:
|
||||
- name: Skipping management of main sudoers file
|
||||
- text: Pillar manage_main_config is False
|
||||
|
||||
Reference in New Issue
Block a user