Revert " split out backports and unstable sources.list"

This reverts commit d203a72afc814bc8aa8a8e30b973d46e0cce8862.

Conflicts:

	templates/sources.list+backports.erb
	templates/sources.list+unstable.erb

diff --git a/templates/sources.list+backports.erb b/templates/sources.list+backports.erb
deleted file mode 100644 (file)
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 (file)
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 1e40b629acc882eaaadf2d27b954b19775c31b77..bcd4fd2775ca40dd50d0d67fc8f38fc5de1c89a9 100644 (file)
--- 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 -%>