From fffd30fe17c15f497eb6f54fdf1ed98a20d7fb90 Mon Sep 17 00:00:00 2001 From: genus Date: Fri, 24 Jul 2015 17:41:49 +0300 Subject: [PATCH 1/2] Add master_sign_pubkey option --- salt/files/master.d/f_defaults.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 40ff5d3..5aaef11 100644 --- 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. From a738198d8bd3974137a801a3f4274079a1ec9ffd Mon Sep 17 00:00:00 2001 From: genus Date: Fri, 24 Jul 2015 17:58:41 +0300 Subject: [PATCH 2/2] Add verify_master_pubkey_sign --- salt/files/minion.d/f_defaults.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf index 3e743c9..7bdf59b 100644 --- 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) -%}