saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

set default user variable to the user cmd runs as

Browse source
This commit is contained in:
Daniel Wallace 2017-02-13 11:05:38 -06:00 • committed by rallytime
parent 881ebf2e93
commit 157f4dcdf9
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/config/__init__.py
View file

@ -10,6 +10,7 @@ import os
import re
import sys
import glob
import getpass
import time
import codecs
import logging
@ -954,7 +955,7 @@ DEFAULT_MINION_OPTS = {
'always_verify_signature': False,
'master_sign_key_name': 'master_sign',
'syndic_finger': '',
'user': 'root',
'user': salt.utils.get_user(),
'root_dir': salt.syspaths.ROOT_DIR,
'pki_dir': os.path.join(salt.syspaths.CONFIG_DIR, 'pki', 'minion'),
'id': '',
@ -1184,7 +1185,7 @@ DEFAULT_MASTER_OPTS = {
'zmq_backlog': 1000,
'pub_hwm': 1000,
'auth_mode': 1,
'user': 'root',
'user': salt.utils.get_user(),
'worker_threads': 5,
'sock_dir': os.path.join(salt.syspaths.SOCK_DIR, 'master'),
'ret_port': 4506,