From df1ba94cbb3c1898dd53f5eac65101db544fe09e Mon Sep 17 00:00:00 2001 From: Jorge Schrauwen Date: Mon, 7 Mar 2016 17:28:40 +0000 Subject: [PATCH] file_ignore_regex is a list, not bool --- salt/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/config.py b/salt/config.py index a914af4ef0..3bdcb25fdc 100644 --- a/salt/config.py +++ b/salt/config.py @@ -540,7 +540,7 @@ VALID_OPTS = { 'token_expire': int, 'file_recv': bool, 'file_recv_max_size': int, - 'file_ignore_regex': bool, + 'file_ignore_regex': list, 'file_ignore_glob': bool, 'fileserver_backend': list, 'fileserver_followsymlinks': bool, @@ -831,7 +831,7 @@ DEFAULT_MINION_OPTS = { 'fileserver_limit_traversal': False, 'file_recv': False, 'file_recv_max_size': 100, - 'file_ignore_regex': None, + 'file_ignore_regex': [], 'file_ignore_glob': None, 'fileserver_backend': ['roots'], 'fileserver_followsymlinks': True, @@ -1091,7 +1091,7 @@ DEFAULT_MASTER_OPTS = { 'file_recv': False, 'file_recv_max_size': 100, 'file_buffer_size': 1048576, - 'file_ignore_regex': None, + 'file_ignore_regex': [], 'file_ignore_glob': None, 'fileserver_backend': ['roots'], 'fileserver_followsymlinks': True,