Switch geodns to use GeoIP2

[chef.git] / cookbooks / geodns / recipes / default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 925b47c4297fd95010165e2e18b1517a55d5b415..a2134457ffab3fe5ba7fe3838a982c1c31f4de7b 100644 (file)
--- 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,6 +45,10 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   notifies :restart, "service[gdnsd]"
 end
 
+service "systemd-resolved" do
+  action [:disable, :stop]
+end
+
 service "gdnsd" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true