Browse Source

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

tags/v1.11.0
Imran Iqbal 2 years ago
parent
commit
b2316ed17b
No account linked to committer's email address
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      salt/minion.sls

+ 6
- 6
salt/minion.sls View File

{% else %} {% else %}
- skip_verify: True - skip_verify: True
{% endif %} {% endif %}
- user: root
- group: wheel
- user: {{ salt_settings.rootuser }}
- 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 }}.*'
{%- 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
{%- 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
{%- 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
{%- 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

Loading…
Cancel
Save