fix(perms): some os have custom user/root

saltstack-formulas · Aug 1, 2019 · 319e077 · 319e077
1 parent 14276e2
commit 319e077
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
@@ -3,6 +3,7 @@
 salt:
   version: ''
   rootuser: root
+  rootgroup: root
   install_packages: True
   use_pip: False
   clean_config_d_dir: True

diff --git a/salt/formulas.sls b/salt/formulas.sls
@@ -4,7 +4,10 @@
 
 {%- from "salt/map.jinja" import formulas_settings with context %}
 {%- from "salt/formulas.jinja" import formulas_git_opt with context %}
-{%- from "salt/formulas.jinja" import formulas_opts_for_git_latest with context %}
+
+## from template-formula
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import salt_settings with context %}
 
 # Loop over all formulas listed in pillar data
 {%- for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %}
@@ -31,6 +34,8 @@
     {%-   for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
                                                {'makedirs': True}).items() %}
     - {{ key }}: {{ value }}
+    - user: {{ salt_settings.rootuser }}
+    - group: {{ salt_settings.rootgroup }}
     {%-   endfor %}
 {%-     endif %}
 

diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
@@ -96,6 +96,7 @@ Alpine:
   libgit2: libgit2
 
 FreeBSD:
+  rootgroup: wheel
   salt_master: py27-salt
   salt_minion: py27-salt
   salt_syndic: py27-salt