add popov.debian.org Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

[mirror/dsa-puppet.git] / modules / debian-org / templates / etc / apt / sources.list.d / volatile.list.erb

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 40dee86..af8fcb9 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,7 +3,6 @@
 ## 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 contrib non-free
+<% unless %w{lenny n/a}.include?(scope.lookupvar('::lsbdistcodename')) %>
+deb    http://ftp.debian.org/debian    <%= lsbdistcodename %>-updates          main contrib non-free
 <% end %>