diff options
| author | Micah Anderson <micah@riseup.net> | 2008-09-28 17:56:11 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2008-09-28 17:56:11 -0400 |
| commit | ab49db3d6762be0aedbcaebffcf816c6058f981a (patch) | |
| tree | e39a2b1dee5210334bb24cca56ae94d67d234443 | |
| parent | 3ecbee6a271e986229348deca91dbf338d98d735 (diff) | |
| download | puppet-apt-ab49db3d6762be0aedbcaebffcf816c6058f981a.tar.gz puppet-apt-ab49db3d6762be0aedbcaebffcf816c6058f981a.tar.bz2 | |
Revert " split out backports and unstable sources.list"
This reverts commit d203a72afc814bc8aa8a8e30b973d46e0cce8862.
Conflicts:
templates/sources.list+backports.erb
templates/sources.list+unstable.erb
| -rw-r--r-- | templates/sources.list+backports.erb | 22 | ||||
| -rw-r--r-- | templates/sources.list+unstable.erb | 15 | ||||
| -rw-r--r-- | templates/sources.list.erb | 7 |
3 files changed, 7 insertions, 37 deletions
diff --git a/templates/sources.list+backports.erb b/templates/sources.list+backports.erb deleted file mode 100644 index bcd4fd2..0000000 --- a/templates/sources.list+backports.erb +++ /dev/null @@ -1,22 +0,0 @@ -# This file is brought to you by puppet - -# basic <%= lsbdistcodename %> -deb http://debian.mirror.iweb.ca/debian/ <%= lsbdistcodename %> main contrib non-free -# security suppport -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There is no security mirror for <%= lsbdistcodename %> -<% else -%> -deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free -<% end -%> -# local packages -#deb http://puppetmaster:81/ / - -# additional packages, see preferences -#deb http://ftp.at.debian.org/debian sid main - -# backports -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There are no backports for for <%= lsbdistcodename %> -<% else -%> -deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main -<% end -%> diff --git a/templates/sources.list+unstable.erb b/templates/sources.list+unstable.erb deleted file mode 100644 index 2ff598d..0000000 --- a/templates/sources.list+unstable.erb +++ /dev/null @@ -1,15 +0,0 @@ -# This file is brought to you by puppet - -# basic <%= lsbdistcodename %> -deb http://debian.mirror.iweb.ca/debian/ <%= lsbdistcodename %> main contrib non-free -# security suppport -<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> -# There is no security mirror for <%= lsbdistcodename %> -<% else -%> -deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free -<% end -%> -# local packages -#deb http://puppetmaster:81/ / - -# follow unstable, pinned in preferences -deb http://ftp.at.debian.org/debian sid main contrib non-free diff --git a/templates/sources.list.erb b/templates/sources.list.erb index 1e40b62..bcd4fd2 100644 --- a/templates/sources.list.erb +++ b/templates/sources.list.erb @@ -13,3 +13,10 @@ deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non- # additional packages, see preferences #deb http://ftp.at.debian.org/debian sid main + +# backports +<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%> +# There are no backports for for <%= lsbdistcodename %> +<% else -%> +deb http://www.backports.org/debian/ <%= lsbdistcodename %>-backports main +<% end -%> |