Merge branch 'master' of gitosis@labs.riseup.net:module_apt

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 {