X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapt-keys%2Fmanifests%2Finit.pp;h=df61688131af84a08d46f429d0eaf5575bb89b88;hb=7f86914b9cb237cb1cf8c720f86902bef717cfaa;hp=666b8f6866396dc45b9b66821dffa41a63c86685;hpb=a036864926be3a40a79b5c930bcce1e66f3f091a;p=mirror%2Fdsa-puppet.git diff --git a/modules/apt-keys/manifests/init.pp b/modules/apt-keys/manifests/init.pp index 666b8f686..df6168813 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:///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:///apt-keys/db.debian.org.asc", + mode => 664, + notify => Exec["apt-keys-update"], + ; } - exec { "updatekeys": - command => "for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done", + 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: