mirror of
https://github.com/saltstack-formulas/salt-formula.git
synced 2026-05-08 18:53:18 +02:00
fix(syndic): private key access
The minion and syndic share a private key. Whilst the minion typically runs under root, good practice is for the syndic process to run under a user with less privileges. This user then needs access to the private key file in order for the syndic to operate. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
dcd6ec46fe
commit
e2c747ab94
@ -212,6 +212,9 @@ permissions-minion-config:
|
||||
- replace: False
|
||||
{% endif %}
|
||||
|
||||
{#- we assume a group with the same name as the user exists #}
|
||||
{%- set syndic_user = salt_settings.get('master', {}).get('syndic_user') %}
|
||||
|
||||
salt-minion-pki-dir:
|
||||
file.directory:
|
||||
{% if 'pki_dir' in salt_settings.minion %}
|
||||
@ -221,13 +224,22 @@ salt-minion-pki-dir:
|
||||
{% endif %}
|
||||
- user: {{ salt_settings.rootuser }}
|
||||
- group:
|
||||
{%- if syndic_user is none %}
|
||||
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
|
||||
wheel
|
||||
{%- else %}
|
||||
{{ salt_settings.rootgroup }}
|
||||
{%- endif %}
|
||||
{%- else %}
|
||||
{{ syndic_user }}
|
||||
{%- endif %}
|
||||
{%- if grains['kernel'] != 'Windows' %}
|
||||
- mode: 700
|
||||
- mode:
|
||||
{%- if syndic_user is none %}
|
||||
700
|
||||
{%- else %}
|
||||
750
|
||||
{%- endif %}
|
||||
{% endif %}
|
||||
- makedirs: True
|
||||
|
||||
@ -238,7 +250,7 @@ permissions-minion.pem:
|
||||
{% else %}
|
||||
- name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pem') }}
|
||||
{% endif %}
|
||||
- user: {{ salt_settings.rootuser }}
|
||||
- user: {{ salt_settings.rootuser if syndic_user is none else syndic_user }}
|
||||
- group:
|
||||
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
|
||||
wheel
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user