saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

fix(windows): group arg not supported on windows

Browse Source
This commit is contained in:
noelmcloughlin 2020-09-11 22:28:29 +01:00
parent 887d1559b5
commit d61e671fa0
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/formulas.sls
View File

@ -39,7 +39,9 @@
{'makedirs': True}).items() %} {'makedirs': True}).items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
- user: {{ salt_settings.rootuser }} - user: {{ salt_settings.rootuser }}
{%- if grains.kernel != 'Windows' %}
- group: {{ salt_settings.rootgroup }} - group: {{ salt_settings.rootgroup }}
{%- endif %}
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}

14
salt/osfamilymap.yaml
View File

@ -15,11 +15,14 @@
{%- set suse_testing_repo = ':/products:/next:/testing' if [osfamily_lower, osrelease] == ['suse', '15.2'] else '' %} {%- set suse_testing_repo = ':/products:/next:/testing' if [osfamily_lower, osrelease] == ['suse', '15.2'] else '' %}
#from template-formula #from template-formula
{%- if grains.os == 'MacOS' %} {%- if grains.os_family == 'MacOS' %}
{%- set macos_rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %} {%- set rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %}
{%- set macos_rootgroup = salt['cmd.run']("stat -f '%Sg' /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 %} {%- endif %}
Debian: Debian:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' 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' 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 '' }} salt_minion: salt-minion{{ '-' ~ py_ver_repr if py_ver_repr else '' }}
config_path: 'C:\salt\conf' config_path: 'C:\salt\conf'
minion_service: salt-minion minion_service: salt-minion
rootuser: {{ rootuser | d('') }}
MacOS: MacOS:
salt_minion: salt salt_minion: salt
@ -138,5 +142,5 @@ MacOS:
config_path: /private/etc/salt config_path: /private/etc/salt
minion_service: com.saltstack.salt.minion minion_service: com.saltstack.salt.minion
## from template-formula ## from template-formula
rootuser: {{ macos_rootuser | d('') }} rootuser: {{ rootuser | d('') }}
rootgroup: {{ macos_rootgroup | d('') }} rootgroup: {{ rootgroup | d('') }}

1
salt/osmap.yaml
View File

@ -63,5 +63,4 @@ MacOS:
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
Windows: Windows:
rootgroup: Users
parallel: false # not supported on windows/cygwin parallel: false # not supported on windows/cygwin