From 356ff9334078198fde39fe5c8e8212109d6537a0 Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@lackof.org>
Date: Wed, 8 Sep 2010 15:39:33 -0700
Subject: backports.org has merged with the normal debian archive, the apt
 source changed and we don't need a separate apt-key for it now

---
 manifests/init.pp | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index 497077b..774f9e4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -69,44 +69,9 @@ class apt {
 
   ## This package should really always be current
   package { "debian-archive-keyring": ensure => latest }
+  # backports uses the normal archive key now
+  package { "debian-backports-keyring": ensure => absent }
         
-  case $lsbdistcodename {
-    etch: {
-      package { "debian-backports-keyring": ensure => latest }
-                
-      # This key was downloaded from
-      # http://backports.org/debian/archive.key
-      # and is needed to bootstrap the backports trustpath
-      file { "${apt_base_dir}/backports.org.key":
-        source => "puppet:///modules/apt/backports.org.key",
-        mode => 0444, owner => root, group => root,
-      }
-      exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && apt-get update":
-        alias => "backports_key",
-        refreshonly => true,
-        subscribe => File["${apt_base_dir}/backports.org.key"],
-        before => [ File["apt_config"], Package["debian-backports-keyring"] ]
-      }
-    }
-    lenny: {
-      package { "debian-backports-keyring": ensure => latest }
-
-      # This key was downloaded from
-      # http://backports.org/debian/archive.key
-      # and is needed to bootstrap the backports trustpath
-      file { "${apt_base_dir}/backports.org.key":
-        source => "puppet:///modules/apt/backports.org.key",
-        mode => 0444, owner => root, group => root,
-      }
-      exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && apt-get update":
-        alias => "backports_key",
-        refreshonly => true,
-        subscribe => File["${apt_base_dir}/backports.org.key"],
-        before => [ Config_file["apt_config"], Package["debian-backports-keyring"] ]
-      }
-    }
-  }
-
   case $custom_key_dir {
     '': {
       exec { "/bin/true # no_custom_keydir": }
-- 
cgit v1.2.3