Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-08 20:43:27 +02: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 committed 2015-07-27 06:58:48 -05:00
2 parents a5923a0df9 a738198d8b
commit 2af4bf3bb5
2 files changed
+6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

salt/files/master.d/f_defaults.conf
+3
View File
@@ -375,6 +375,9 @@ client_acl_blacklist:
{{ get_config('sign_pub_message', 'False') }} {{ get_config('sign_pub_message', 'False') }}
{{ get_config('master_sign_pubkey', 'False') }}
##### Master Module Management ##### ##### Master Module Management #####
########################################## ##########################################
# Manage how master side modules are loaded. # Manage how master side modules are loaded.
salt/files/minion.d/f_defaults.conf
+3
View File
@@ -155,6 +155,9 @@ mine_functions:
# master check alive interval # master check alive interval
{{ get_config('master_alive_interval', '30') }} {{ get_config('master_alive_interval', '30') }}
# verify_master_pubkey_sign
{{ get_config('verify_master_pubkey_sign', 'False') }}
# include extra config # include extra config
{% if 'include' in cfg_minion -%} {% if 'include' in cfg_minion -%}
{% if isinstance(cfg_minion['include'], list) -%} {% if isinstance(cfg_minion['include'], list) -%}