haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chef proxy settings now work for chef server [closes GH-335]

This commit is contained in:
Mitchell Hashimoto 2011-05-12 00:12:39 -07:00
parent ed48c2daf8
commit 104f59dbba
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
- Chef environments support (for Chef 0.10) [GH-358] - Chef environments support (for Chef 0.10) [GH-358]
- Suppress the "added to known hosts" message for SSH [GH-354] - Suppress the "added to known hosts" message for SSH [GH-354]
- Ruby 1.8.6 support [GH-352] - Ruby 1.8.6 support [GH-352]
- Chef proxy settings now work for chef server [GH-335]
## 0.7.3 (April 19, 2011) ## 0.7.3 (April 19, 2011)

14
templates/chef_server_client.erb
View File

@ -10,13 +10,21 @@ validation_client_name "<%= validation_client_name %>"
validation_key "<%= validation_key %>" validation_key "<%= validation_key %>"
client_key "<%= client_key %>" client_key "<%= client_key %>"
file_cache_path "<%= file_cache_path %>"
file_backup_path "<%= file_backup_path %>"
<% unless environment.nil? %> <% unless environment.nil? %>
environment "<%= environment %>" environment "<%= environment %>"
<% end %> <% end %>
file_cache_path "<%= file_cache_path %>"
file_backup_path "<%= file_backup_path %>"
http_proxy <%= http_proxy.inspect %>
http_proxy_user <%= http_proxy_user.inspect %>
http_proxy_pass <%= http_proxy_pass.inspect %>
https_proxy <%= https_proxy.inspect %>
https_proxy_user <%= https_proxy_user.inspect %>
https_proxy_pass <%= https_proxy_pass.inspect %>
no_proxy <%= no_proxy.inspect %>
pid_file "/var/run/chef/chef-client.pid" pid_file "/var/run/chef/chef-client.pid"
Mixlib::Log::Formatter.show_time = true Mixlib::Log::Formatter.show_time = true