Rename conf.d to config.djdm/knife-bootstrap-clientd

3 files changed, 5 insertions, 5 deletions

diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb
index b9fec3230c..8161cd9ea7 100644
--- a/chef-config/lib/chef-config/config.rb
+++ b/chef-config/lib/chef-config/config.rb
@@ -498,7 +498,7 @@ module ChefConfig
 
     # A directory that contains additional configuration scripts to load for
     # the workstation config
-    default(:conf_d_dir) { PathHelper.join(config_dir, "conf.d") }
+    default(:config_d_dir) { PathHelper.join(config_dir, "config.d") }
 
     # Where should chef-solo download recipes from?
     default :recipe_url, nil
diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb
index ba15a1eb5d..babb78aeb8 100644
--- a/chef-config/lib/chef-config/workstation_config_loader.rb
+++ b/chef-config/lib/chef-config/workstation_config_loader.rb
@@ -74,7 +74,7 @@ module ChefConfig
         apply_config(IO.read(config_location), config_location)
       end
 
-      load_dot_d(Config[:conf_d_dir]) if Config[:conf_d_dir]
+      load_dot_d(Config[:config_d_dir]) if Config[:config_d_dir]
     end
 
     # (Private API, public for test purposes)
diff --git a/chef-config/spec/unit/workstation_config_loader_spec.rb b/chef-config/spec/unit/workstation_config_loader_spec.rb
index f24265ddff..087f249724 100644
--- a/chef-config/spec/unit/workstation_config_loader_spec.rb
+++ b/chef-config/spec/unit/workstation_config_loader_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
   before do
     # We set this to nil so that a dev workstation will
     # not interfere with the tests.
-    ChefConfig::Config[:conf_d_dir] = nil
+    ChefConfig::Config[:config_d_dir] = nil
   end
 
   # Test methods that do I/O or reference external state which are stubbed out
@@ -308,7 +308,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
       end
 
       before do
-        ChefConfig::Config[:conf_d_dir] = tempdir
+        ChefConfig::Config[:config_d_dir] = tempdir
         allow(config_loader).to receive(:path_exists?).with(
           an_instance_of(String)).and_return(false)
       end
@@ -355,7 +355,7 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
 
     context "when the conf.d directory does not exist" do
       before do
-        ChefConfig::Config[:conf_d_dir] = "/nope/nope/nope/nope/notdoingit"
+        ChefConfig::Config[:config_d_dir] = "/nope/nope/nope/nope/notdoingit"
       end
 
       it "does not load anything" do