From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Sep 2009 23:18:40 +0000 (+0200)
Subject: Also do not volatile and backports on squeeze machines
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=2acc7a284282d25df2aa96c4ebcb8b5fca522d05;p=mirror%2Fdsa-puppet.git

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 11663c181..6a5248159 100644
--- 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 fab100b15..16c450c6f 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
 ##
 
+<% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
+<% else %>
 deb     http://volatile.debian.org/debian-volatile lenny/volatile   main
+<% end %>