diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2018-06-23 23:24:50 -0700 |
|---|---|---|
| committer | Noah Kantrowitz <noah@coderanger.net> | 2018-06-23 23:24:50 -0700 |
| commit | 79fc2d7ecf5b6a3248bbc22e37d9374d78359fb9 (patch) | |
| tree | 209f79ef546d83df318df45861b3063618f95490 | |
| parent | cc1831038c2c3b519a9675fe15981ed05ce33cdb (diff) | |
| download | chef-79fc2d7ecf5b6a3248bbc22e37d9374d78359fb9.tar.gz | |
Check if a proxy is set specifically to nil.
Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
| -rw-r--r-- | chef-config/lib/chef-config/config.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index c41e2b420f..d376cd0483 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -970,10 +970,10 @@ module ChefConfig # TODO add some post-file-parsing logic that automatically calls this so # users don't have to def self.export_proxies - export_proxy("http", http_proxy, http_proxy_user, http_proxy_pass) if has_key?(:http_proxy) - export_proxy("https", https_proxy, https_proxy_user, https_proxy_pass) if has_key?(:https_proxy) - export_proxy("ftp", ftp_proxy, ftp_proxy_user, ftp_proxy_pass) if has_key?(:ftp_proxy) - export_no_proxy(no_proxy) if has_key?(:no_proxy) + export_proxy("http", http_proxy, http_proxy_user, http_proxy_pass) if has_key?(:http_proxy) && http_proxy + export_proxy("https", https_proxy, https_proxy_user, https_proxy_pass) if has_key?(:https_proxy) && https_proxy + export_proxy("ftp", ftp_proxy, ftp_proxy_user, ftp_proxy_pass) if has_key?(:ftp_proxy) && ftp_proxy + export_no_proxy(no_proxy) if has_key?(:no_proxy) && no_proxy end # Character classes for Addressable |