X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapt-keys%2Fmanifests%2Finit.pp;h=92966b9425df94da752f500bdf888dd47d8c2fa5;hb=d5e93222fd71702a2deda660e960ebf6fca4aa47;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..92966b942 100644 --- a/modules/apt-keys/manifests/init.pp +++ b/modules/apt-keys/manifests/init.pp @@ -3,18 +3,23 @@ class apt-keys { "/etc/apt/trusted-keys.d/": ensure => directory, purge => true, - notify => Exec["updatekeys"], + 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"], + 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 } }