diff options
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c050703..a542887 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -89,27 +89,30 @@ class apt { alias => apt_updated; } + ## This package should really always be current + package { "debian-archive-keyring": + ensure => latest, + } + case $lsbdistcodename { etch: { - ## This package should really always be current - package { - [ "debian-archive-keyring", "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"] ] - } + 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"] ] + } } } } |