Sfoglia il codice sorgente

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

tags/v1.11.0
Imran Iqbal 2 anni fa
parent
commit
b2316ed17b
Nessun account collegato all'indirizzo email del committer
1 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. +6
    -6
      salt/minion.sls

+ 6
- 6
salt/minion.sls Vedi File

@@ -20,8 +20,8 @@ download-salt-minion:
{% else %}
- skip_verify: True
{% endif %}
- user: root
- group: wheel
- user: {{ salt_settings.rootuser }}
- group: {{ salt_settings.rootgroup }}
- mode: '0644'
- unless:
- 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'] %}
wheel
{%- else %}
root
{{ salt_settings.rootgroup }}
{%- endif %}
{%- if grains['kernel'] != 'Windows' %}
- mode: 640
@@ -224,7 +224,7 @@ salt-minion-pki-dir:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel
{%- else %}
root
{{ salt_settings.rootgroup }}
{%- endif %}
{%- if grains['kernel'] != 'Windows' %}
- mode: 700
@@ -243,7 +243,7 @@ permissions-minion.pem:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel
{%- else %}
root
{{ salt_settings.rootgroup }}
{%- endif %}
{%- if grains['kernel'] != 'Windows' %}
- mode: 400
@@ -264,7 +264,7 @@ permissions-minion.pub:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel
{%- else %}
root
{{ salt_settings.rootgroup }}
{%- endif %}
{%- if grains['kernel'] != 'Windows' %}
- mode: 644

Loading…
Annulla
Salva