Quellcode durchsuchen

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 vor 8 Jahren
Ursprung
Commit
724e603689
2 geänderte Dateien mit 18 neuen und 3 gelöschten Zeilen
  1. +12
    -2
      salt/cloud.sls
  2. +6
    -1
      salt/gitfs/keys.sls

+ 12
- 2
salt/cloud.sls Datei anzeigen

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

+ 6
- 1
salt/gitfs/keys.sls Datei anzeigen

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

Laden…
Abbrechen
Speichern