diff options
| author | david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1> | 2007-08-03 15:07:32 +0000 |
|---|---|---|
| committer | david <david@f03ff2f1-f02d-0410-970d-b9634babeaa1> | 2007-08-03 15:07:32 +0000 |
| commit | 8dfbc303a50979ddcbb481816f202ab60256e113 (patch) | |
| tree | 193dd5cc3c888628e5995150f32083b36713a470 /manifests | |
| parent | 911386327e5280ef2cbbbe7f1635d082d3c7ba92 (diff) | |
| download | puppet-apt-8dfbc303a50979ddcbb481816f202ab60256e113.tar.gz puppet-apt-8dfbc303a50979ddcbb481816f202ab60256e113.tar.bz2 | |
another try at fixing the debian-backports-key
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@161 f03ff2f1-f02d-0410-970d-b9634babeaa1
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index e8ffbca..721ecf5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -79,7 +79,6 @@ class apt { package { [ "debian-archive-keyring", "debian-backports-keyring" ]: ensure => latest, - require => [ File[apt_config], Exec["backports_key"] ], } # This key was downloaded from @@ -88,13 +87,12 @@ class apt { file { "${apt_base_dir}/backports.org.key": source => "puppet://$servername/apt/backports.org.key", mode => 0444, owner => root, group => root, - before => File[apt_config], } - exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key": + exec { "/usr/bin/apt-key add ${apt_base_dir}/backports.org.key && dselect update": alias => "backports_key", refreshonly => true, subscribe => File["${apt_base_dir}/backports.org.key"], - before => File[apt_config], + before => [ File[apt_config], Package["debian-backports-keyring"] ] } } } |