瀏覽代碼

Use a different group name for GID 0 depending on the minion's O/S

Some Unix variants name GID 0 "wheel".  Unfortunately, one cannot
specify this group by ID, because Python conflates integer 0 with
boolean False, nor can one specify this group using the string '0',
because of assumptions in the Salt or Python codebases regarding group
names.
tags/v0.57.0
Matthew X. Economou 7 年之前
父節點
當前提交
3746f08f2f
沒有連結到貢獻者的電子郵件帳戶。
共有 2 個檔案被更改,包括 18 行新增3 行删除
  1. +12
    -2
      salt/cloud.sls
  2. +6
    -1
      salt/gitfs/keys.sls

+ 12
- 2
salt/cloud.sls 查看文件

@@ -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 查看文件

@@ -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:

Loading…
取消
儲存