Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

fix(minion.sls): fix for #541

This commit is contained in:
Michael Alphonso 2023-08-28 07:44:51 -04:00
parent 2a7a9decee
commit 99cad77fb9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/minion.sls
View File

@ -20,8 +20,10 @@ download-salt-minion:
{% else %} {% else %}
- skip_verify: True - skip_verify: True
{% endif %} {% endif %}
{%- if grains['kernel'] != 'Windows' %}
- user: {{ salt_settings.rootuser }} - user: {{ salt_settings.rootuser }}
- group: {{ salt_settings.rootgroup }} - group: {{ salt_settings.rootgroup }}
{% endif %}
- 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 }}.*'
@ -199,6 +201,7 @@ remove-macpackage-salt:
permissions-minion-config: permissions-minion-config:
file.managed: file.managed:
- name: {{ salt_settings.config_path | path_join('minion') }} - name: {{ salt_settings.config_path | path_join('minion') }}
{%- if grains['kernel'] != 'Windows' %}
- user: {{ salt_settings.rootuser }} - user: {{ salt_settings.rootuser }}
- group: - group:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
@ -206,6 +209,7 @@ permissions-minion-config:
{%- else %} {%- else %}
{{ salt_settings.rootgroup }} {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{% endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 640 - mode: 640
{% endif %} {% endif %}
@ -219,6 +223,7 @@ salt-minion-pki-dir:
{% else %} {% else %}
- name: {{ salt_settings.config_path | path_join('pki', 'minion') }} - name: {{ salt_settings.config_path | path_join('pki', 'minion') }}
{% endif %} {% endif %}
{%- if grains['kernel'] != 'Windows' %}
- user: {{ salt_settings.rootuser }} - user: {{ salt_settings.rootuser }}
- group: - group:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
@ -226,6 +231,7 @@ salt-minion-pki-dir:
{%- else %} {%- else %}
{{ salt_settings.rootgroup }} {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{% endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 700 - mode: 700
{% endif %} {% endif %}
@ -238,6 +244,7 @@ permissions-minion.pem:
{% else %} {% else %}
- name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pem') }} - name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pem') }}
{% endif %} {% endif %}
{%- if grains['kernel'] != 'Windows' %}
- user: {{ salt_settings.rootuser }} - user: {{ salt_settings.rootuser }}
- group: - group:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %} {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
@ -245,6 +252,7 @@ permissions-minion.pem:
{%- else %} {%- else %}
{{ salt_settings.rootgroup }} {{ salt_settings.rootgroup }}
{%- endif %} {%- endif %}
{% endif %}
{%- if grains['kernel'] != 'Windows' %} {%- if grains['kernel'] != 'Windows' %}
- mode: 400 - mode: 400
{% endif %} {% endif %}