saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

add publisher_acl to salt master config

Browse Source
This commit is contained in:
Vitali Quiering 2017-03-24 13:07:19 +01:00
parent 31229c5a0d
commit d3b46a3648
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
salt/files/master.d/f_defaults.conf
View File

@ -332,7 +332,24 @@ event_return_blacklist:
# This setting should be treated with care since it opens up execution # This setting should be treated with care since it opens up execution
# capabilities to non root users. By default this capability is completely # capabilities to non root users. By default this capability is completely
# disabled. # disabled.
{% if 'client_acl' in cfg_master -%} {% if 'publisher_acl' in cfg_master -%}
{%- do default_keys.append('publisher_acl') %}
publisher_acl:
{%- for name, user in cfg_master['publisher_acl']|dictsort %}
{{ name}}:
{%- for command in user %}
- {% raw %}'{% endraw %}{{ command }}{% raw %}'{% endraw %}
{%- endfor -%}
{%- endfor -%}
{% elif 'publisher_acl' in cfg_salt -%}
publisher_acl:
{%- for name, user in cfg_salt['publisher_acl']|dictsort %}
{{ name }}:
{%- for command in user %}
- {% raw %}'{% endraw %}{{ command }}{% raw %}'{% endraw %}
{%- endfor -%}
{%- endfor -%}
{% elif 'client_acl' in cfg_master -%}
{%- do default_keys.append('client_acl') %} {%- do default_keys.append('client_acl') %}
client_acl: client_acl:
{%- for name, user in cfg_master['client_acl']|dictsort %} {%- for name, user in cfg_master['client_acl']|dictsort %}
@ -350,7 +367,7 @@ client_acl:
{%- endfor -%} {%- endfor -%}
{%- endfor -%} {%- endfor -%}
{% else -%} {% else -%}
#client_acl: #publisher_acl:
# larry: # larry:
# - test.ping # - test.ping
# - network.* # - network.*
@ -361,7 +378,28 @@ client_acl:
# This example would blacklist all non sudo users, including root from # This example would blacklist all non sudo users, including root from
# running any commands. It would also blacklist any use of the "cmd" # running any commands. It would also blacklist any use of the "cmd"
# module. This is completely disabled by default. # module. This is completely disabled by default.
{% if 'client_acl_blacklist' in cfg_master %} {% if 'publisher_acl_blacklist' in cfg_master %}
{%- do default_keys.append('publisher_acl_blacklist') %}
publisher_acl_blacklist:
users:
{% for user in cfg_master['publisher_acl_blacklist'].get('users', []) %}
- {{ user }}
{% endfor %}
modules:
{% for mod in cfg_master['publisher_acl_blacklist'].get('modules', []) %}
- {{ mod }}
{% endfor %}
{% elif 'publisher_acl_blacklist' in cfg_salt %}
publisher_acl_blacklist:
users:
{% for user in cfg_salt['publisher_acl_blacklist'].get('users', []) %}
- {{ user }}
{% endfor %}
modules:
{% for mod in cfg_salt['publisher_acl_blacklist'].get('modules', []) %}
- {{ mod }}
{% endfor %}
{% elif 'client_acl_blacklist' in cfg_master %}
{%- do default_keys.append('client_acl_blacklist') %} {%- do default_keys.append('client_acl_blacklist') %}
client_acl_blacklist: client_acl_blacklist:
users: users: