diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 14:11:19 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 14:11:19 -0200 |
| commit | 1203852923594064e61fcfa0e4bf35f72000175d (patch) | |
| tree | a2e24e5555da35cef04a6929a7669663d60c1311 /templates/20proxy.erb | |
| parent | b9d11f17fff581fc854823e22a50539fc9e6ace3 (diff) | |
| parent | 045e1fc748c83b55ce03c5cb2aa0a8ae29904975 (diff) | |
| download | puppet-apt-1203852923594064e61fcfa0e4bf35f72000175d.tar.gz puppet-apt-1203852923594064e61fcfa0e4bf35f72000175d.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/shared-apt
Conflicts:
manifests/init.pp
templates/sources.list.backports.erb
Diffstat (limited to 'templates/20proxy.erb')
| -rw-r--r-- | templates/20proxy.erb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/templates/20proxy.erb b/templates/20proxy.erb new file mode 100644 index 0000000..fd0c7fe --- /dev/null +++ b/templates/20proxy.erb @@ -0,0 +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::bugs.debian.org "DIRECT"; |