Also do not volatile and backports on squeeze machines

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
index 11663c181d44a868f611e4dc944ad77bdcaef56f..6a52481593b1bb8d5cc4c5352c5598f881f3add5 100644 (file)
--- a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
@@ -3,5 +3,8 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
+<% else %>
 #deb     http://debian.sil.at/backports.org/        lenny-backports main
 deb    http://mirror.netcologne.de/debian-backports/   lenny-backports main 
+<% end %>

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
index fab100b150f77074eea933f91407c079870bba33..16c450c6f330529947d59657708fdefe6aeed8b0 100644 (file)
--- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
@@ -3,4 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
+<% else %>
 deb     http://volatile.debian.org/debian-volatile lenny/volatile   main
+<% end %>