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

set sensible default values to ease configuration

Browse Source 
signing key-pair settings
master_sign_key_name - name of the signing key-pair, without suffix
master_sign_pubkey - enable/disable signing the public key

signing signature settings
master_pubkey_signature - the pre-computed signature of master.pub + <sign_key>.pem
master_use_pubkey_signature - enable/disable usage of the pre-computed signature

verify_master_pub_sig - enable pubkey signature checking on the minion
This commit is contained in:
vs 2014-06-26 06:03:41 -07:00
parent bf49622f4b
commit 7b2754255b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/config.py
View File

@ -61,6 +61,8 @@ VALID_OPTS = {
'master_sign_key_name': str, 'master_sign_key_name': str,
'master_sign_pubkey': bool, 'master_sign_pubkey': bool,
'verify_master_pubkey_sign': bool, 'verify_master_pubkey_sign': bool,
'master_pubkey_signature': str,
'master_use_pubkey_signature': bool,
'syndic_finger': str, 'syndic_finger': str,
'user': str, 'user': str,
'root_dir': str, 'root_dir': str,
@ -258,7 +260,7 @@ DEFAULT_MINION_OPTS = {
'master_shuffle': False, 'master_shuffle': False,
'master_alive_interval': 0, 'master_alive_interval': 0,
'verify_master_pubkey_sign': False, 'verify_master_pubkey_sign': False,
'master_sign_key_name': False, 'master_sign_key_name': 'master_sign',
'syndic_finger': '', 'syndic_finger': '',
'user': 'root', 'user': 'root',
'root_dir': salt.syspaths.ROOT_DIR, 'root_dir': salt.syspaths.ROOT_DIR,
@ -521,8 +523,10 @@ DEFAULT_MASTER_OPTS = {
'queue_dirs': [], 'queue_dirs': [],
'cli_summary': False, 'cli_summary': False,
'max_minions': 0, 'max_minions': 0,
'master_sign_key_name': False, 'master_sign_key_name': 'master_sign',
'master_sign_pubkey': False, 'master_sign_pubkey': False,
'master_pubkey_signature': 'master_pubkey_signature',
'master_use_pubkey_signature': False,
} }
# ----- Salt Cloud Configuration Defaults -----------------------------------> # ----- Salt Cloud Configuration Defaults ----------------------------------->