diff options
| author | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-02-28 12:34:54 +0000 |
| commit | 31f8661eea49b05f32ccca4ad3d628548ba54b77 (patch) | |
| tree | 93020168f8979b317c3a7c93e2b8ec154078385a /templates/20proxy.erb | |
| parent | 7c55bee06ab952c914b3a367f495e36a2539807f (diff) | |
| parent | 8ed07cac2f084bfe542f4978daa783aedd7e79b4 (diff) | |
| download | puppet-apt-31f8661eea49b05f32ccca4ad3d628548ba54b77.tar.gz puppet-apt-31f8661eea49b05f32ccca4ad3d628548ba54b77.tar.bz2 | |
Merge branch 'master' into 'master'
Merge with cmaisonnneuve and immerda
See merge request !4
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 ea706b6..520e7b1 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 "<%= proxy %>:<%= port %>"; }; +Acquire::http { Proxy "<%= @proxy %>:<%= @port %>"; }; Acquire::HTTP::Proxy::bugs.debian.org "DIRECT"; |