X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fetc%2Fapt%2Fsources.list.d%2Fvolatile.list.erb;fp=modules%2Fdebian-org%2Ftemplates%2Fetc%2Fapt%2Fsources.list.d%2Fvolatile.list.erb;h=31019200c89a74c306f75baf0b8a95776bf221d4;hb=2154688028bed791732c2000498f1d9fcfe64d5f;hp=d64eb30f1b02cc099d0ee95c3203695f000fdcee;hpb=d32e0db21b3189bc85385eb4a7af1835bd3769a9;p=mirror%2Fdsa-puppet.git

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 d64eb30f1..31019200c 100644
--- 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,8 +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 nodeinfo['squeeze'] %>
-deb	http://ftp.debian.org/debian	squeeze-updates		main contrib non-free
-<% else %>
+<% if lsbdistcodename == 'lenny' %>
 deb     http://volatile.debian.org/debian-volatile lenny/volatile   main contrib non-free
+<% elsif lsbdistcodename != 'n/a' %>
+deb	http://ftp.debian.org/debian	<%= lsbdistcodename %>-updates		main contrib non-free
 <% end %>