Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-28 02:57:50 +01:00
Code Issues Activity

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

Browse Source 
Use a different group name for GID 0 depending on the minion's O/S
This commit is contained in:
Niels Abspoel 2017-01-22 23:35:52 +01:00 committed by GitHub
commit 724e603689
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/cloud.sls
View File

@ -48,7 +48,12 @@ cloud-cert-{{ cert }}-pem:
- 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:
@ -91,7 +96,12 @@ salt-cloud-providers-permissions:
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:

7
salt/gitfs/keys.sls
View File

@ -10,7 +10,12 @@ gitfs-key-{{ key }}-{{ type }}:
- 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: