Skip to content

Commit b2316ed

Browse files
committed
fix(minion): replace literals with rootuser & rootgroup from map
1 parent 3eff2d2 commit b2316ed

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

salt/minion.sls

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ download-salt-minion:
2020
{% else %}
2121
- skip_verify: True
2222
{% endif %}
23-
- user: root
24-
- group: wheel
23+
- user: {{ salt_settings.rootuser }}
24+
- group: {{ salt_settings.rootgroup }}
2525
- mode: '0644'
2626
- unless:
2727
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
@@ -204,7 +204,7 @@ permissions-minion-config:
204204
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
205205
wheel
206206
{%- else %}
207-
root
207+
{{ salt_settings.rootgroup }}
208208
{%- endif %}
209209
{%- if grains['kernel'] != 'Windows' %}
210210
- mode: 640
@@ -224,7 +224,7 @@ salt-minion-pki-dir:
224224
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
225225
wheel
226226
{%- else %}
227-
root
227+
{{ salt_settings.rootgroup }}
228228
{%- endif %}
229229
{%- if grains['kernel'] != 'Windows' %}
230230
- mode: 700
@@ -243,7 +243,7 @@ permissions-minion.pem:
243243
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
244244
wheel
245245
{%- else %}
246-
root
246+
{{ salt_settings.rootgroup }}
247247
{%- endif %}
248248
{%- if grains['kernel'] != 'Windows' %}
249249
- mode: 400
@@ -264,7 +264,7 @@ permissions-minion.pub:
264264
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
265265
wheel
266266
{%- else %}
267-
root
267+
{{ salt_settings.rootgroup }}
268268
{%- endif %}
269269
{%- if grains['kernel'] != 'Windows' %}
270270
- mode: 644

0 commit comments

Comments
 (0)