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

Make pidfile respect root_dir setting

Browse Source
This commit is contained in:
Tris Forster 2012-12-21 20:36:12 +11:00
parent 54ac2e23f6
commit 8d723cddc1
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.py
View File

@ -238,6 +238,7 @@ def minion_config(path, check_dns=True):
'retry_dns': 30,
'recon_max': 5000,
'win_repo_cachefile': 'salt://win/repo/winrepo.p',
'pidfile': '/var/run/salt-minion.pid',
}
if len(opts['sock_dir']) > len(opts['cachedir']) + 10:
@ -300,7 +301,7 @@ def minion_config(path, check_dns=True):
# Prepend root_dir to other paths
prepend_root_dirs = [
'pki_dir', 'cachedir', 'sock_dir', 'extension_modules'
'pki_dir', 'cachedir', 'sock_dir', 'extension_modules', 'pidfile',
]
# These can be set to syslog, so, not actual paths on the system
@ -411,7 +412,7 @@ def master_config(path):
)
opts['token_dir'] = os.path.join(opts['cachedir'], 'tokens')
# Prepend root_dir to other paths
prepend_root_dir(opts, ['pki_dir', 'cachedir', 'log_file',
prepend_root_dir(opts, ['pki_dir', 'cachedir', 'log_file', 'pidfile',
'sock_dir', 'key_logfile', 'extension_modules',
'autosign_file', 'token_dir'])