diff options
Diffstat (limited to 'chef-config/lib/chef-config/config.rb')
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 0046d25f78..8eceef605e 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -24,7 +24,7 @@ require "pathname" require "chef-config/fips" require "chef-config/logger" -require "chef-config/windows" +require "chef-helpers" require "chef-config/path_helper" require "chef-config/mixin/fuzzy_hostname_matcher" @@ -60,7 +60,7 @@ module ChefConfig # @return [String] a platform specific path def self.platform_specific_path(path) path = PathHelper.cleanpath(path) - if ChefConfig.windows? + if ChefHelpers.windows? # turns \etc\chef\client.rb and \var\chef\client.rb into C:/chef/client.rb # Some installations will be on different drives so use the drive that # the expanded path to __FILE__ is found. @@ -78,7 +78,7 @@ module ChefConfig # # @return [String] the drive letter def self.windows_installation_drive - if ChefConfig.windows? + if ChefHelpers.windows? drive = File.expand_path(__FILE__).split("/", 2)[0] drive = ENV["SYSTEMDRIVE"] if drive.to_s == "" drive @@ -540,7 +540,7 @@ module ChefConfig # Path to the default CA bundle files. default :ssl_ca_path, nil default(:ssl_ca_file) do - if ChefConfig.windows? && embedded_dir + if ChefHelpers.windows? && embedded_dir cacert_path = File.join(embedded_dir, "ssl/certs/cacert.pem") cacert_path if File.exist?(cacert_path) else @@ -799,7 +799,7 @@ module ChefConfig # Those lists of regular expressions define what chef considers a # valid user and group name - if ChefConfig.windows? + if ChefHelpers.windows? set_defaults_for_windows else set_defaults_for_nix @@ -1082,7 +1082,7 @@ module ChefConfig end end rescue - if ChefConfig.windows? + if ChefHelpers.windows? ChefConfig.logger.trace "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else." else ChefConfig.logger.trace "No usable locale -a command found, assuming you have en_US.UTF-8 installed." |