Browse Source

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

tags/v0.58.2
N 5 years ago
parent
commit
beb0e85b04
No account linked to committer's email address
3 changed files with 8 additions and 0 deletions
  1. +1
    -0
      salt/defaults.yaml
  2. +6
    -0
      salt/formulas.sls
  3. +1
    -0
      salt/osfamilymap.yaml

+ 1
- 0
salt/defaults.yaml View File

@@ -3,6 +3,7 @@
salt:
version: ''
rootuser: root
rootgroup: root
install_packages: True
use_pip: False
clean_config_d_dir: True

+ 6
- 0
salt/formulas.sls View File

@@ -6,6 +6,10 @@
{%- 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() %}
{%- for entry in entries %}
@@ -31,6 +35,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 %}


+ 1
- 0
salt/osfamilymap.yaml View File

@@ -96,6 +96,7 @@ Alpine:
libgit2: libgit2

FreeBSD:
rootgroup: wheel
salt_master: py27-salt
salt_minion: py27-salt
salt_syndic: py27-salt

Loading…
Cancel
Save