Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-01-20 09:44:28 +01:00
Code Issues Activity

Merge pull request #161 from genuss/sign_pubkey

Browse Source 
Add options for mult-master setup
This commit is contained in:
puneet kandhari 2015-07-27 06:58:48 -05:00
commit 2af4bf3bb5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/files/master.d/f_defaults.conf
View File

@ -375,6 +375,9 @@ client_acl_blacklist:
{{ get_config('sign_pub_message', 'False') }}
{{ get_config('master_sign_pubkey', 'False') }}
##### Master Module Management #####
##########################################
# Manage how master side modules are loaded.

3
salt/files/minion.d/f_defaults.conf
View File

@ -155,6 +155,9 @@ mine_functions:
# master check alive interval
{{ get_config('master_alive_interval', '30') }}
# verify_master_pubkey_sign
{{ get_config('verify_master_pubkey_sign', 'False') }}
# include extra config
{% if 'include' in cfg_minion -%}
{% if isinstance(cfg_minion['include'], list) -%}