Browse Source

Merge 99cad77fb9 into bf52207a9b

pull/554/merge
Michael 2 weeks ago
parent
commit
fcede27190
No account linked to committer's email address
1 changed files with 10 additions and 2 deletions
  1. +10
    -2
      salt/minion.sls

+ 10
- 2
salt/minion.sls View File

{% 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 }}.*'
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'] %}
{%- 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 %}
- name: {{ salt_settings.minion.pki_dir }} - name: {{ salt_settings.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'] %}
{%- 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 %}
- name: {{ salt_settings.minion.pki_dir | path_join('minion.pem') }} - name: {{ salt_settings.minion.pki_dir | path_join('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'] %}
{%- 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 %}

Loading…
Cancel
Save