diff options
| -rw-r--r-- | files/02show_upgraded | 3 | ||||
| -rw-r--r-- | files/03clean | 3 | ||||
| -rw-r--r-- | files/preferences | 3 | ||||
| -rw-r--r-- | templates/20proxy.erb | 3 | ||||
| -rw-r--r-- | templates/Debian/sources.list.deb-src.erb | 1 | ||||
| -rw-r--r-- | templates/Debian/sources.list.erb | 1 | ||||
| -rw-r--r-- | templates/Debian/sources.list.volatile.erb | 1 | ||||
| -rw-r--r-- | templates/Ubuntu/sources.list.backports.erb | 1 | ||||
| -rw-r--r-- | templates/Ubuntu/sources.list.deb-src.erb | 1 | ||||
| -rw-r--r-- | templates/Ubuntu/sources.list.erb | 1 |
10 files changed, 18 insertions, 0 deletions
diff --git a/files/02show_upgraded b/files/02show_upgraded index 870a3a9..eb046b2 100644 --- a/files/02show_upgraded +++ b/files/02show_upgraded @@ -1 +1,4 @@ +# This file is brought to you by Puppet +# all local modifications will be overwritten + APT::Get::Show-Upgraded true; diff --git a/files/03clean b/files/03clean index 335823d..d878375 100644 --- a/files/03clean +++ b/files/03clean @@ -1 +1,4 @@ +# This file is brought to you by Puppet +# all local modifications will be overwritten + DSelect::Clean auto; diff --git a/files/preferences b/files/preferences index e893b7e..7495131 100644 --- a/files/preferences +++ b/files/preferences @@ -1,3 +1,6 @@ +# This file is brought to you by Puppet +# all local modifications will be overwritten + Package: * Pin: release a=unstable Pin-Priority: 1 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.deb-src.erb b/templates/Debian/sources.list.deb-src.erb index 6811eca..e167ab6 100644 --- a/templates/Debian/sources.list.deb-src.erb +++ b/templates/Debian/sources.list.deb-src.erb @@ -1,4 +1,5 @@ # This file is brought to you by puppet +# all local modifications will be overwritten # basic <%= lsbdistcodename %> deb-src http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 169d7b5..ab029ca 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 # basic <%= lsbdistcodename %> deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free diff --git a/templates/Debian/sources.list.volatile.erb b/templates/Debian/sources.list.volatile.erb index 06d6590..d8527b6 100644 --- a/templates/Debian/sources.list.volatile.erb +++ b/templates/Debian/sources.list.volatile.erb @@ -1,4 +1,5 @@ # This file is brought to you by puppet +# all local modifications will be overwritten <% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable" || lsbdistcodename == "squeeze") -%> # There are no backports for for <%= lsbdistcodename %> diff --git a/templates/Ubuntu/sources.list.backports.erb b/templates/Ubuntu/sources.list.backports.erb index 66610a6..2bb0ad2 100644 --- a/templates/Ubuntu/sources.list.backports.erb +++ b/templates/Ubuntu/sources.list.backports.erb @@ -1,4 +1,5 @@ # This file is brought to you by puppet +# all local modifications will be overwritten # backports deb http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main universe multiverse restricted diff --git a/templates/Ubuntu/sources.list.deb-src.erb b/templates/Ubuntu/sources.list.deb-src.erb index f04de67..22f103b 100644 --- a/templates/Ubuntu/sources.list.deb-src.erb +++ b/templates/Ubuntu/sources.list.deb-src.erb @@ -1,4 +1,5 @@ # This file is brought to you by puppet +# all local modifications will be overwritten # basic <%= lsbdistcodename %> deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index dfecd63..a37fffc 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 http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse |