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

fix(minion): replace literals with `rootuser` & `rootgroup` from map

This commit is contained in:
Imran Iqbal 2022-05-17 07:32:17 +01:00
parent 3eff2d2acf
commit b2316ed17b
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/minion.sls
View File

@ -20,8 +20,8 @@ download-salt-minion:
{% else %} {% else %}
- skip_verify: True - skip_verify: True
{% endif %} {% endif %}
- user: root - user: {{ salt_settings.rootuser }}
- group: wheel - group: {{ salt_settings.rootgroup }}
- mode: '0644' - mode: '0644'
- unless: - unless:
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*' - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
@ -204,7 +204,7 @@ permissions-minion-config:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel wheel
{%- else %} {%- else %}
root {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 640 - mode: 640
@ -224,7 +224,7 @@ salt-minion-pki-dir:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel wheel
{%- else %} {%- else %}
root {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 700 - mode: 700
@ -243,7 +243,7 @@ permissions-minion.pem:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel wheel
{%- else %} {%- else %}
root {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 400 - mode: 400
@ -264,7 +264,7 @@ permissions-minion.pub:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel wheel
{%- else %} {%- else %}
root {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 644 - mode: 644