Skip to content

Commit 99cad77

Browse files
committed
fix(minion.sls): fix for #541
1 parent 2a7a9de commit 99cad77

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

salt/minion.sls

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ download-salt-minion:
2020
{% else %}
2121
- skip_verify: True
2222
{% endif %}
23+
{%- if grains['kernel'] != 'Windows' %}
2324
- user: {{ salt_settings.rootuser }}
2425
- group: {{ salt_settings.rootgroup }}
26+
{% endif %}
2527
- mode: '0644'
2628
- unless:
2729
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
@@ -199,13 +201,15 @@ remove-macpackage-salt:
199201
permissions-minion-config:
200202
file.managed:
201203
- name: {{ salt_settings.config_path | path_join('minion') }}
204+
{%- if grains['kernel'] != 'Windows' %}
202205
- user: {{ salt_settings.rootuser }}
203206
- group:
204207
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
205208
wheel
206209
{%- else %}
207210
{{ salt_settings.rootgroup }}
208211
{%- endif %}
212+
{% endif %}
209213
{%- if grains['kernel'] != 'Windows' %}
210214
- mode: 640
211215
{% endif %}
@@ -218,14 +222,16 @@ salt-minion-pki-dir:
218222
- name: {{ salt_settings.minion.pki_dir }}
219223
{% else %}
220224
- name: {{ salt_settings.config_path | path_join('pki', 'minion') }}
221-
{% endif %}
225+
{% endif %}
226+
{%- if grains['kernel'] != 'Windows' %}
222227
- user: {{ salt_settings.rootuser }}
223228
- group:
224229
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
225230
wheel
226231
{%- else %}
227232
{{ salt_settings.rootgroup }}
228233
{%- endif %}
234+
{% endif %}
229235
{%- if grains['kernel'] != 'Windows' %}
230236
- mode: 700
231237
{% endif %}
@@ -237,14 +243,16 @@ permissions-minion.pem:
237243
- name: {{ salt_settings.minion.pki_dir | path_join('minion.pem') }}
238244
{% else %}
239245
- name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pem') }}
240-
{% endif %}
246+
{% endif %}
247+
{%- if grains['kernel'] != 'Windows' %}
241248
- user: {{ salt_settings.rootuser }}
242249
- group:
243250
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
244251
wheel
245252
{%- else %}
246253
{{ salt_settings.rootgroup }}
247254
{%- endif %}
255+
{% endif %}
248256
{%- if grains['kernel'] != 'Windows' %}
249257
- mode: 400
250258
{% endif %}

0 commit comments

Comments
 (0)