Fix error reporting for blog aggregator cron job

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 09f28c9d9817025e292ac52259fd8b094b2078ba..a0ee24646fe42e075b1555d43bacc7e1eb35ecf9 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -17,53 +17,29 @@
 # limitations under the License.
 #
 
-package "pdns-server"
-package "pdns-backend-geo"
+package "geoip-database-contrib"
 
-service "pdns" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
-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]"
-end
+package "gdnsd"
 
-directory "/etc/powerdns/zones.d" do
-  owner "root"
-  group "root"
-  mode "0755"
+service "gdnsd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
 end
 
-template "/etc/powerdns/zones.d/tile.conf" do
-  source "tile.conf.erb"
+template "/etc/gdnsd/config" do
+  source "config.erb"
   owner "root"
   group "root"
-  mode "0644"
-  notifies :reload, "service[pdns]"
+  mode 0o644
+  notifies :restart, "service[gdnsd]"
 end
 
-template "/etc/cron.weekly/geodns-update" do
-  source "cron.erb"
+template "/etc/gdnsd/zones/geo.openstreetmap.org" do
+  source "geo.erb"
   owner "root"
   group "root"
-  mode "0755"
-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"
-  group "root"
-  not_if { File.exist?("/etc/powerdns/countries.conf") }
+  mode 0o644
+  notifies :restart, "service[gdnsd]"
 end
 
 firewall_rule "accept-dns-udp" do