aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:50:43 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:50:43 +0100
commit3de76e7b05224b9696a75908b0a4259349e20823 (patch)
tree428799424b34d7911e6dd39a0ab2ef94c7900525 /templates
parentf25a8a91099d6c1ef512a5fb21581abc62e1519a (diff)
parent92aa5a51e95d74604a40318558aa98f70fcf7720 (diff)
downloadpuppet-apt-3de76e7b05224b9696a75908b0a4259349e20823.tar.gz
puppet-apt-3de76e7b05224b9696a75908b0a4259349e20823.tar.bz2
Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.
A bunch of painlessly merged commits. Conflicts: manifests/init.pp
Diffstat (limited to 'templates')
-rw-r--r--templates/20proxy.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/20proxy.erb b/templates/20proxy.erb
index 36b26a0..8f57e73 100644
--- a/templates/20proxy.erb
+++ b/templates/20proxy.erb
@@ -1,4 +1,4 @@
# This file is brought to you by Puppet
# all local modifications will be overwritten
-Acquire::http { Proxy "http://<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; };
+Acquire::http { Proxy "<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; };