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
This commit is contained in:
		
						commit
						724e603689
					
				| @ -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: | ||||
|  | ||||
| @ -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…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Niels Abspoel
						Niels Abspoel