From: Tom Hughes <tom@compton.nu>
Date: Thu, 20 Aug 2020 07:19:03 +0000 (+0100)
Subject: Purge old geoip packages
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/145bccd7b212796f65b6fe3c98718bc90d7d272d

Purge old geoip packages
---

diff --git a/cookbooks/geoipupdate/recipes/default.rb b/cookbooks/geoipupdate/recipes/default.rb
index b27b439b6..3b116c869 100644
--- a/cookbooks/geoipupdate/recipes/default.rb
+++ b/cookbooks/geoipupdate/recipes/default.rb
@@ -21,6 +21,19 @@ include_recipe "apt"
 
 license_keys = data_bag_item("geoipupdate", "license-keys")
 
+package "geoip-database" do
+  action :purge
+end
+
+package "geoip-database-contrib" do
+  action :purge
+end
+
+package "geoipupdate" do
+  action :purge
+  only_if { ::File.exist?("/etc/cron.d/geoipupdate") }
+end
+
 package "geoipupdate"
 
 template "/etc/GeoIP.conf" do
@@ -31,7 +44,7 @@ template "/etc/GeoIP.conf" do
   variables :license_keys => license_keys
 end
 
-execute "geoipdate" do
+execute "geoipupdate" do
   command "geoipupdate"
   user "root"
   group "root"