summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-05-27 13:52:32 -0700
committerClaire McQuin <claire@getchef.com>2014-06-03 09:17:18 -0700
commita2ef9f1a93af762c1d17c6b30551e1f5d9388ab3 (patch)
tree9e4295a547a739fd9eb11b3789e8717134198338
parente52798c5fda734553304e98585cbe5142bc116c9 (diff)
downloadchef-a2ef9f1a93af762c1d17c6b30551e1f5d9388ab3.tar.gz
update for setting proxy env vars
-rw-r--r--CHANGELOG.md1
-rw-r--r--DOC_CHANGES.md12
2 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b25a72b10..a91f9fb2f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
* Add config options for attribute whitelisting in node.save. (CHEF-3811)
* Use user's .chef as a fallback cache path if /var/chef is not accessible. (CHEF-5259)
* Fixed Ruby 2.0 Windows compatibility issues around ruby-wmi gem by replacing it with wmi-lite gem.
+* Set PROXY environment variables if preset in config. (CHEF-4712)
## Release: 11.12.4 (04/30/2014)
http://www.getchef.com/blog/2014/04/30/release-chef-client-11-12-4-ohai-7-0-4/
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 9365cdddd2..cf3fdc5bd3 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -81,3 +81,15 @@ If your config file looks like `automatic_attribute_whitelist = []`, then none o
The default behavior is for the node to save all the attribute data. This can be ensured by setting your whitelist filter to `nil`.
We recommend only using `automatic_attribute_whitelist` to reduce the size of the system data being stored for nodes, and discourage the use of the other attribute whitelists except by advanced users.
+
+### Set PROXY environment variables if present in your config file.
+
+If `:http_proxy`, `:https_proxy`, `:ftp_proxy`, or `:no_proxy` is found in your config file, we will configure your environment variables according to the variable form and configuration info given. If your config file looks like
+
+````
+http_proxy "http://proxy.example.org:8080"
+http_proxy_user "myself"
+http_proxy_pass "Password1"
+````
+
+then Chef will set `ENV[:HTTP_PROXY] = "http://myself:Password1@proxy.example.org:8080"`