summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-03-04 16:20:33 -0500
committerMicah Anderson <micah@riseup.net>2009-03-04 16:20:33 -0500
commitb8a4b550b020e56e77a3a16696a1fec33313613e (patch)
tree9cc6ecce550c63d6dcd8289a307d2dbb2610cd61
parent42d4f33f4163eadec8d1195d943707cfdb867dba (diff)
parentb68f73c026eab8e73b46c29766582176b7786794 (diff)
Merge branch 'master' of gitosis@labs.riseup.net:module_apt
-rw-r--r--manifests/init.pp19
1 files changed, 19 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 6a13de4..dc868d7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -111,6 +111,25 @@ class apt {
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://$servername/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"] ]
+ }
+ }
}
case $custom_key_dir {