Merge pull request #161 from genuss/sign_pubkey

Add options for mult-master setup
saltstack-formulas · Jul 27, 2015 · 2af4bf3 · 2af4bf3
2 parents a5923a0 + a738198
commit 2af4bf3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
@@ -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.

diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
@@ -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) -%}