X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f3b1617008c17e80dbc15af4b1bb8c7d03a4799e..6f6ac0de26339fe17da0594649ce1b1dfe2c7f80:/cookbooks/geodns/recipes/default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 09f28c9d9..8a72c17a2 100644
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -17,53 +17,67 @@
 # limitations under the License.
 #
 
-package "pdns-server"
-package "pdns-backend-geo"
-
 service "pdns" do
-  action [ :enable, :start ]
+  action [ :stop, :disable ]
   supports :status => true, :restart => true, :reload => true
 end
 
+file "/etc/powerdns/countries.conf" do
+  action :delete
+end
+
 file "/etc/powerdns/pdns.d/pdns.simplebind" do
   action :delete
   notifies :reload, "service[pdns]"
 end
 
-template "/etc/powerdns/pdns.d/geo.conf" do
-  source "geo.conf.erb"
-  owner "root"
-  group "root"
-  mode "0600"
-  notifies :reload, "service[pdns]"
+file "/etc/powerdns/pdns.d/geo.conf" do
+  action :delete
+end
+
+file "/etc/powerdns/zones.d/tile.conf" do
+  action :delete
 end
 
 directory "/etc/powerdns/zones.d" do
-  owner "root"
-  group "root"
-  mode "0755"
+  action :delete
 end
 
-template "/etc/powerdns/zones.d/tile.conf" do
-  source "tile.conf.erb"
-  owner "root"
-  group "root"
-  mode "0644"
-  notifies :reload, "service[pdns]"
+file "/etc/cron.weekly/geodns-update" do
+  action :delete
+end
+
+package "pdns-backend-geo" do
+  action :purge
+end
+
+package "pdns-server" do
+  action :purge
 end
 
-template "/etc/cron.weekly/geodns-update" do
-  source "cron.erb"
+package "geoip-database-contrib"
+
+package "gdnsd"
+
+service "gdnsd" do
+  action [ :enable, :start ]
+  supports :status => true, :restart => true, :reload => true
+end
+
+template "/etc/gdnsd/config" do
+  source "config.erb"
   owner "root"
   group "root"
-  mode "0755"
+  mode 0644
+  notifies :restart, "service[gdnsd]"
 end
 
-execute "geodns-sync-countries" do
-  command "rsync -z rsync://countries-ns.mdc.dk/zone/zz.countries.nerd.dk.rbldnsd /etc/powerdns/countries.conf"
-  user "root"
+template "/etc/gdnsd/zones/geo.openstreetmap.org" do
+  source "geo.erb"
+  owner "root"
   group "root"
-  not_if { File.exist?("/etc/powerdns/countries.conf") }
+  mode 0644
+  notifies :restart, "service[gdnsd]"
 end
 
 firewall_rule "accept-dns-udp" do