Browse Source

fix(minion): fix windows path construction

tags/v1.10.0
Heinz Wiesinger 3 years ago
parent
commit
c9c6e12223
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      salt/minion.sls

+ 2
- 2
salt/minion.sls View File

@@ -78,7 +78,7 @@ salt-minion:
{%- endif %}
{% endif %}
file.recurse:
- name: {{ salt_settings.config_path }}/minion.d
- name: {{ salt_settings.config_path | path_join('minion.d') }}
{%- if salt_settings.minion_config_use_TOFS %}
- template: ''
- source: {{ files_switch(['minion.d'],
@@ -183,7 +183,7 @@ remove-default-minion-conf-file:
# clean up old _defaults.conf file if they have it around
remove-old-minion-conf-file:
file.absent:
- name: {{ salt_settings.config_path }}/minion.d/_defaults.conf
- name: {{ salt_settings.config_path | path_join('minion.d', '_defaults.conf') }}

{% if grains.os == 'MacOS' %}
remove-macpackage-salt:

Loading…
Cancel
Save