mirror of
https://github.com/saltstack-formulas/salt-formula.git
synced 2024-11-27 22:38:10 +01:00
fix(minion): replace literals with rootuser
& rootgroup
from map
This commit is contained in:
parent
3eff2d2acf
commit
b2316ed17b
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user