valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #40467 from twangboy/master_service

Browse Source 
Set user to 'SYSTEM' for Master to run as Service
This commit is contained in:
Nicole Thomas 2017-03-31 16:53:32 -06:00 committed by GitHub
commit f1124e1993
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/config/__init__.py
View File

@ -66,9 +66,13 @@ if salt.utils.is_windows():
# chance of working.
_DFLT_IPC_MODE = 'tcp'
_MASTER_TRIES = -1
# This needs to be SYSTEM in order for salt-master to run as a Service
# Otherwise, it will not respond to CLI calls
_MASTER_USER = 'SYSTEM'
else:
_DFLT_IPC_MODE = 'ipc'
_MASTER_TRIES = 1
_MASTER_USER = salt.utils.get_user()
def _gather_buffer_space():
@ -1285,7 +1289,7 @@ DEFAULT_MASTER_OPTS = {
'zmq_backlog': 1000,
'pub_hwm': 1000,
'auth_mode': 1,
'user': salt.utils.get_user(),
'user': _MASTER_USER,
'worker_threads': 5,
'sock_dir': os.path.join(salt.syspaths.SOCK_DIR, 'master'),
'ret_port': 4506,