aboutsummaryrefslogtreecommitdiff
path: root/templates/20proxy.erb
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2013-01-02 16:14:06 +0100
committerintrigeri <intrigeri@boum.org>2013-01-02 16:14:06 +0100
commit517040bb2e088325c2baa5bc4e9860d218357669 (patch)
treeeeca8062bf072c780aafe6f3b6ae22782a8e1914 /templates/20proxy.erb
parentcda713fcf6bd189c3e870c9e466aa5f41d1847b6 (diff)
parent07a031f2050deecfefa205e1e0c63586692a06ff (diff)
downloadpuppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.gz
puppet-apt-517040bb2e088325c2baa5bc4e9860d218357669.tar.bz2
Merge remote-tracking branch 'riseup/immerda_27_readme' into shared
Conflicts: README manifests/cron/dist_upgrade.pp manifests/cron/download.pp manifests/init.pp manifests/preferences.pp
Diffstat (limited to 'templates/20proxy.erb')
-rw-r--r--templates/20proxy.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/20proxy.erb b/templates/20proxy.erb
index fd0c7fe..ea706b6 100644
--- a/templates/20proxy.erb
+++ b/templates/20proxy.erb
@@ -1,5 +1,5 @@
// This file is managed by Puppet
// all local modifications will be overwritten
-Acquire::http { Proxy "<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; };
+Acquire::http { Proxy "<%= proxy %>:<%= port %>"; };
Acquire::HTTP::Proxy::bugs.debian.org "DIRECT";