diff options
Diffstat (limited to 'chef-config/lib/chef-config/config.rb')
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 2a9f5e87aa..dd583fb079 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -30,9 +30,7 @@ require "uri" require "openssl" module ChefConfig - class Config - extend Mixlib::Config # Evaluates the given string as config. @@ -57,7 +55,7 @@ module ChefConfig path end - def self.add_formatter(name, file_path=nil) + def self.add_formatter(name, file_path = nil) formatters << [name, file_path] end @@ -115,7 +113,7 @@ module ChefConfig end end elsif configuration[:cookbook_artifact_path] - File.expand_path("..", self.configuration[:cookbook_artifact_path]) + File.expand_path("..", self.configuration[:cookbook_artifact_path]) else cache_path end @@ -141,7 +139,7 @@ module ChefConfig if chef_repo_path.kind_of?(String) PathHelper.join(chef_repo_path, child_path) else - chef_repo_path.uniq.map { |path| PathHelper.join(path, child_path)} + chef_repo_path.uniq.map { |path| PathHelper.join(path, child_path) } end end @@ -367,7 +365,7 @@ module ChefConfig # if the chef_server_url is a path to an organization, aka # 'some_url.../organizations/*' then remove the '/organization/*' by default if self.configuration[:chef_server_url] =~ /\/organizations\/\S*$/ - self.configuration[:chef_server_url].split("/")[0..-3].join("/") + self.configuration[:chef_server_url].split("/")[0..-3].join("/") elsif self.configuration[:chef_server_url] # default to whatever chef_server_url is self.configuration[:chef_server_url] else @@ -449,7 +447,6 @@ module ChefConfig # effect if `policy_document_native_api` is set to `false`. default :deployment_group, nil - # Set these to enable SSL authentication / mutual-authentication # with the server |