fix(windows): group arg not supported on windows
This commit is contained in:
		
							parent
							
								
									887d1559b5
								
							
						
					
					
						commit
						d61e671fa0
					
				| @ -39,7 +39,9 @@ | ||||
|                                                {'makedirs': True}).items() %} | ||||
|     - {{ key }}: {{ value }} | ||||
|     - user: {{ salt_settings.rootuser }} | ||||
|         {%- if grains.kernel != 'Windows' %} | ||||
|     - group: {{ salt_settings.rootgroup }} | ||||
|         {%- endif %} | ||||
|     {%-   endfor %} | ||||
| {%-     endif %} | ||||
| 
 | ||||
|  | ||||
| @ -15,11 +15,14 @@ | ||||
| {%- set suse_testing_repo = ':/products:/next:/testing' if [osfamily_lower, osrelease] == ['suse', '15.2'] else '' %} | ||||
| 
 | ||||
| #from template-formula | ||||
| {%- if grains.os == 'MacOS' %} | ||||
| {%-   set macos_rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %} | ||||
| {%-   set macos_rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %} | ||||
| {%- if grains.os_family == 'MacOS' %} | ||||
| {%-   set rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %} | ||||
| {%-   set rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %} | ||||
| {%- elif grains.os_family == 'Windows' %} | ||||
| {%-   set rootuser = salt['cmd.run']("id -un") %} | ||||
| {%- endif %} | ||||
| 
 | ||||
| 
 | ||||
| Debian: | ||||
|   pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' | ||||
|   key_url: 'https://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' | ||||
| @ -130,6 +133,7 @@ Windows: | ||||
|   salt_minion: salt-minion{{ '-' ~ py_ver_repr if py_ver_repr else '' }} | ||||
|   config_path: 'C:\salt\conf' | ||||
|   minion_service: salt-minion | ||||
|   rootuser: {{ rootuser | d('') }} | ||||
| 
 | ||||
| MacOS: | ||||
|   salt_minion: salt | ||||
| @ -138,5 +142,5 @@ MacOS: | ||||
|   config_path: /private/etc/salt | ||||
|   minion_service: com.saltstack.salt.minion | ||||
|   ## from template-formula | ||||
|   rootuser: {{ macos_rootuser | d('') }} | ||||
|   rootgroup: {{ macos_rootgroup | d('') }} | ||||
|   rootuser: {{ rootuser | d('') }} | ||||
|   rootgroup: {{ rootgroup | d('') }} | ||||
|  | ||||
| @ -63,5 +63,4 @@ MacOS: | ||||
|   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 | ||||
| 
 | ||||
| Windows: | ||||
|   rootgroup: Users | ||||
|   parallel: false   # not supported on windows/cygwin | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 noelmcloughlin
						noelmcloughlin