Add support for distributing gdnsd configuration via rsync

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index da1acad067078940c85c594d9822c83581994b7c..9f7c100c5b6b0f8eff17db8f455b6564b7442383 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -18,10 +18,23 @@
 #
 
 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
+
+directory "/etc/gdnsd/config.d" do
+  owner "nobody"
+  group "nogroup"
+  mode 0o755
+end
+
 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
@@ -38,10 +51,6 @@ 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