From: Stephen Gran <steve@lobefin.net>
Date: Tue, 22 Sep 2009 23:21:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7439479a5603cef1d7744d445d8f0aaf9b697db2;hp=94765c19819e8fc49c33ec6593d7db70e9029930;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 24a2f82fa..6c8a729da 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -9,7 +9,7 @@ class buildd {
 
    file {
       "/etc/apt/sources.list.d/buildd.list":
-             source  => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
+             content => template("buildd/etc/apt/sources.list.d/buildd.list.erb"),
              require => Package["apt-transport-https"],
              notify  => Exec["apt-get update"],
              ;
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..88c4db442 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,7 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-#deb     http://debian.sil.at/backports.org/        lenny-backports main
+<% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
+<% else %>
 deb	http://mirror.netcologne.de/debian-backports/	lenny-backports main 
+<% end %>
diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
index d78540213..07b137ad9 100644
--- a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
@@ -5,5 +5,5 @@
 
 <% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
 <% else %>
-deb     http://security.geo.debian.org/             lenny/updates    main
+deb     http://security.debian.org/             lenny/updates    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 %>