X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/aff3fbe6802d93a8deae8fa2637589c8d28f6681..28d3b4a01faa4780e97c15edc9575c24ff7944d0:/cookbooks/apt/providers/source.rb

diff --git a/cookbooks/apt/providers/source.rb b/cookbooks/apt/providers/source.rb
index b6a318634..048d1eeae 100644
--- a/cookbooks/apt/providers/source.rb
+++ b/cookbooks/apt/providers/source.rb
@@ -25,9 +25,14 @@ use_inline_resources
 
 action :create do
   if new_resource.key
-    execute "apt-key-#{new_resource.key}" do
+    execute "apt-key-#{new_resource.key}-clean" do
+      command "/usr/bin/apt-key adv --batch --delete-key --yes #{new_resource.key}"
+      only_if "/usr/bin/apt-key adv --list-keys #{new_resource.key} | fgrep expired"
+    end
+
+    execute "apt-key-#{new_resource.key}-install" do
       command "/usr/bin/apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys #{new_resource.key}"
-      not_if "/usr/bin/apt-key list | /bin/fgrep -q #{new_resource.key}"
+      not_if "/usr/bin/apt-key adv --list-keys #{new_resource.key}"
     end
   end
 
@@ -35,7 +40,7 @@ action :create do
     source new_resource.template
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :url => new_resource.url
   end
 end