diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-18 10:51:59 -0200 |
commit | c2219fa645251599b797b2574e6a68212d676f66 (patch) | |
tree | b2b5cb63bee1abc3f2ae31b81cd417b292355b6c /templates/20proxy.erb | |
parent | 8bfd579a82b6f824b0184bb2e33a384254426eec (diff) | |
parent | 14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff) | |
download | puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.gz puppet-apt-c2219fa645251599b797b2574e6a68212d676f66.tar.bz2 |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'templates/20proxy.erb')
-rw-r--r-- | templates/20proxy.erb | 2 |
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"; |