diff options
| author | intrigeri <intrigeri@boum.org> | 2010-11-21 16:38:50 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-11-21 16:38:50 +0100 |
| commit | 71d42350d1edb643a20e651a6c4ab965e6903305 (patch) | |
| tree | e0928f5e4b9164528e6be3fd36efbf8256ddb09f /templates | |
| parent | d30069c178ff2aff9154f65bd7dbf988c4d002f1 (diff) | |
| parent | 1b0bc415977c1c8b49390e0cdb1361769e0fdbae (diff) | |
Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.
Merging one more commit.
Conflicts:
files/preferences
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.backports.erb
templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/20proxy.erb | 3 | ||||
| -rw-r--r-- | templates/Debian/sources.list.erb | 1 | ||||
| -rw-r--r-- | templates/Ubuntu/sources.list.erb | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/templates/20proxy.erb b/templates/20proxy.erb index e72319f..36b26a0 100644 --- a/templates/20proxy.erb +++ b/templates/20proxy.erb @@ -1 +1,4 @@ +# This file is brought to you by Puppet +# all local modifications will be overwritten + Acquire::http { Proxy "http://<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; }; diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 67da85d..7fb9bdf 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -1,4 +1,5 @@ # This file is brought to you by puppet +# all local modifications will be overwritten ### Debian current: <%= codename %> diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index 1486e95..2a25d6f 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -1,4 +1,5 @@ # This file is brought to you by puppet +# all local modifications will be overwritten # basic <%= lsbdistcodename %> deb <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %> |