Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
(MODULES-3983) Update parallel_tests for ruby 2.0.0
[puppet-modules/puppetlabs-apt.git]
/
templates
/
proxy.erb
diff --git
a/templates/proxy.erb
b/templates/proxy.erb
index accb0ccee8dad67ede066a86745a2373935ab75b..670e3a7e870fe24f7fa21e1e4a6147a29163a50b 100644
(file)
--- a/
templates/proxy.erb
+++ b/
templates/proxy.erb
@@
-1
+1,4
@@
-Acquire::http::Proxy "http://<%= @proxy_host %>:<%= @proxy_port %>";
+Acquire::http::proxy "http://<%= @_proxy['host'] %>:<%= @_proxy['port'] %>/";
+<%- if @_proxy['https'] %>
+Acquire::https::proxy "https://<%= @_proxy['host'] %>:<%= @_proxy['port'] %>/";
+<%- end -%>