From 41f2de74bd92b9b03ea7544e6815786c12c2f8d4 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Fri, 11 Dec 2015 12:42:16 +0000 Subject: [PATCH] * add gitfs whitelist and blacklist --- salt/files/master.d/f_defaults.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 54cb732..770c8d9 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -652,6 +652,30 @@ gitfs_remotes: # repository and defaults to the repository root. {{ get_config('gitfs_root', 'somefolder/otherfolder') }} +# The gitfs_env_whitelist and gitfs_env_blacklist parameters allow for greater +# control over which branches/tags are exposed as fileserver environments. +{% if 'gitfs_env_whitelist' in cfg_master -%} +gitfs_env_whitelist: + {%- for git_env in cfg_master['gitfs_env_whitelist'] %} + - {{ git_env }} + {%- endfor -%} +{% else -%} +# gitfs_env_whitelist: +# - base +# - v1.* +{% endif %} + +{% if 'gitfs_env_blacklist' in cfg_master -%} +gitfs_env_blacklist: + {%- for git_env in cfg_master['gitfs_env_blacklist'] %} + - {{ git_env }} + {%- endfor -%} +{% else -%} +# gitfs_env_blacklist: +# - bug/* +# - feature/* +{% endif %} + ##### Pillar settings ##### ##########################################