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

add tokens dir to master opts

Browse Source
This commit is contained in:
Thomas S Hatch 2012-10-02 11:54:15 -06:00
parent 70ec8677b0
commit 5511857758
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/config.py
View File

@ -329,9 +329,11 @@ def master_config(path):
opts['aes'] = salt.crypt.Crypticle.generate_key_string()
opts['extension_modules'] = os.path.join(opts['cachedir'], 'extmods')
opts['tokens'] = os.path.join(opts['cachedir'], 'tokens')
# Prepend root_dir to other paths
prepend_root_dir(opts, ['pki_dir', 'cachedir', 'log_file',
'sock_dir', 'key_logfile', 'extension_modules', 'autosign_file'])
'sock_dir', 'key_logfile', 'extension_modules',
'autosign_file', 'tokens'])
# Enabling open mode requires that the value be set to True, and
# nothing else!