X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21ce79ac2849907a01c17459f18e4d5b1c870400..9891b6455a40018f68fa9c548e238110dd0099c3:/cookbooks/geodns/recipes/default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 250f148c4..0e20e2a26 100644
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -18,10 +18,17 @@
 #
 
 package %w[
-  geoip-database-contrib
+  geoipupdate
   gdnsd
 ]
 
+execute "geoipdate" do
+  command "geoipupdate"
+  user "root"
+  group "root"
+  not_if { ::File.exist?("/var/lib/GeoIP/GeoLite2-Country.mmdb") }
+end
+
 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
@@ -38,12 +45,6 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   notifies :restart, "service[gdnsd]"
 end
 
-if node[:lsb][:release].to_f >= 18.04
-  service "systemd-resolved" do
-    action [:disable, :stop]
-  end
-end
-
 service "gdnsd" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true