aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Ferrari <pietro@riseup.net>2009-03-04 12:34:18 -0800
committerPietro Ferrari <pietro@riseup.net>2009-03-04 12:34:18 -0800
commitb68f73c026eab8e73b46c29766582176b7786794 (patch)
treee0d65840c658a8fb4348ad73172681aa319f7cad
parent769bf79dddc4790d8dc67bae7e6ca13e7cc6ee88 (diff)
downloadpuppet-apt-b68f73c026eab8e73b46c29766582176b7786794.tar.gz
puppet-apt-b68f73c026eab8e73b46c29766582176b7786794.tar.bz2
try to use backports.org key for lenny too
-rw-r--r--manifests/init.pp19
1 files changed, 19 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b5faef3..a5e1730 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 {