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;h=40dee863af7d9a57f84e4b9c7976beee9b90f4a7;hb=e21e651b3f5c2e26f539e7d6ce950d16e0b11d29;hp=fab100b150f77074eea933f91407c079870bba33;hpb=05c748b00f7d02cbbe8e4e0e64aee97f40ccd43b;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 fab100b15..40dee863a 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,4 +3,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-deb     http://volatile.debian.org/debian-volatile lenny/volatile   main
+<% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
+<% else %>
+deb     http://volatile.debian.org/debian-volatile lenny/volatile   main contrib non-free
+<% end %>