summaryrefslogtreecommitdiff
path: root/chef-config
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-02-04 16:45:08 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-02-24 21:24:14 -0800
commit0584f32a8cbc82db9b1361e7a3a9f42bfbe5af51 (patch)
tree5a8c64ff6896c042c8d85916b00c8551228e0d6b /chef-config
parent8e03a08291db95db0dc2f6fd98da494668c3f3ab (diff)
downloadchef-0584f32a8cbc82db9b1361e7a3a9f42bfbe5af51.tar.gz
Add client_d_dir configuration
This configuration defaults to config_dir/client.d, but can be set to nil if you do not want chef-client loading any extra config files.
Diffstat (limited to 'chef-config')
-rw-r--r--chef-config/lib/chef-config/config.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index 9d18f4f2be..b162cacd89 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -490,6 +490,9 @@ module ChefConfig
# HTTP file servers.
default(:trusted_certs_dir) { PathHelper.join(config_dir, "trusted_certs") }
+ # A directory that contains additional configuration scripts to load
+ default(:client_d_dir) { PathHelper.join(config_dir, "client.d") }
+
# Where should chef-solo download recipes from?
default :recipe_url, nil