From 3746f08f2f721e22130bdda0a0c9aecd8d24fb26 Mon Sep 17 00:00:00 2001 From: "Matthew X. Economou" Date: Fri, 13 Jan 2017 07:52:18 -0500 Subject: [PATCH] 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. --- salt/cloud.sls | 14 ++++++++++++-- salt/gitfs/keys.sls | 7 ++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/salt/cloud.sls b/salt/cloud.sls index 63d4776..bf66959 100644 --- a/salt/cloud.sls +++ b/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: diff --git a/salt/gitfs/keys.sls b/salt/gitfs/keys.sls index 3b002b8..e432909 100644 --- a/salt/gitfs/keys.sls +++ b/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: