X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapt-keys%2Fmanifests%2Finit.pp;h=c296ec55ef1a1bc89e07d112b3673e2ca2b19d01;hb=c894c8a3b264b05d8c14450e9c7e6bd35932b56d;hp=6ecdca64823978fd703975cb969a16b2eb07ec5f;hpb=883b44d512d135ef79bda79d73139a7b70b6b813;p=mirror%2Fdsa-puppet.git diff --git a/modules/apt-keys/manifests/init.pp b/modules/apt-keys/manifests/init.pp index 6ecdca648..c296ec55e 100644 --- a/modules/apt-keys/manifests/init.pp +++ b/modules/apt-keys/manifests/init.pp @@ -1,21 +1,29 @@ class apt-keys { file { "/etc/apt/trusted-keys.d/": - ensure => directory, - purge => true, - notify => Exec["updatekeys"], - ; + ensure => directory, + purge => true, + notify => Exec["apt-keys-update"], + ; + "/etc/apt/trusted-keys.d/backports.org.asc": + source => "puppet:///modules/apt-keys/backports.org.asc", + mode => 664, + notify => Exec["apt-keys-update"], + ; "/etc/apt/trusted-keys.d/db.debian.org.asc": - source => "puppet:///apt-keys/db.debian.org.asc", - mode => 664, - notify => Exec["updatekeys"], - ; + source => "puppet:///modules/apt-keys/db.debian.org.asc", + mode => 664, + notify => Exec["apt-keys-update"], + ; } - exec { "updatekeys": + exec { "apt-keys-update": command => 'for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done', refreshonly => true } } +# vim:set et: +# vim:set sts=4 ts=4: +# vim:set shiftwidth=4: