diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 16:15:02 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 16:15:02 -0500 |
| commit | 8ed07cac2f084bfe542f4978daa783aedd7e79b4 (patch) | |
| tree | 93020168f8979b317c3a7c93e2b8ec154078385a /templates/20proxy.erb | |
| parent | e3e0b46ca6039170c2d2faa8b2bebf14460679eb (diff) | |
| parent | 53e78e61fefefe85939a3c3b5efcd147deebca61 (diff) | |
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
Conflicts:
templates/Debian/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 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"; |