Browse Source

Merge pull request #283 from irtnog/fix-root-group-bsd

Use a different group name for GID 0 depending on the minion's O/S
tags/v0.57.0
Niels Abspoel 8 years ago
parent
commit
724e603689
2 changed files with 18 additions and 3 deletions
  1. +12
    -2
      salt/cloud.sls
  2. +6
    -1
      salt/gitfs/keys.sls

+ 12
- 2
salt/cloud.sls View File

- source: salt://{{ slspath }}/files/key - source: salt://{{ slspath }}/files/key
- template: jinja - template: jinja
- user: root - user: root
- group: root
- group:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel
{%- else %}
root
{%- endif %}
- mode: 600 - mode: 600
- makedirs: True - makedirs: True
- defaults: - defaults:
file.directory: file.directory:
- name: {{ salt_settings.config_path }}/cloud.providers.d - name: {{ salt_settings.config_path }}/cloud.providers.d
- user: root - user: root
- group: root
- group:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel
{%- else %}
root
{%- endif %}
- file_mode: 600 - file_mode: 600
- dir_mode: 700 - dir_mode: 700
- recurse: - recurse:

+ 6
- 1
salt/gitfs/keys.sls View File

- source: salt://salt/files/gitfs_key.jinja - source: salt://salt/files/gitfs_key.jinja
- template: jinja - template: jinja
- user: root - user: root
- group: root
- group:
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
wheel
{%- else %}
root
{%- endif %}
- mode: 600 - mode: 600
- makedirs: True - makedirs: True
- defaults: - defaults:

Loading…
Cancel
Save