oxidized: add accounts dependency

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 3102217e63d1000866e8be2957b25985e0a1e3da..af7dad5a4b37b8fdc5c4a7ecc42122dda336ecfc 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -39,12 +39,26 @@ package %w[
   lockfile-progs
 ]
 
-remote_file "/usr/local/bin/dnscontrol" do
-  action :create
-  source "https://github.com/StackExchange/dnscontrol/releases/download/v3.10.1/dnscontrol-Linux"
+cache_dir = Chef::Config[:file_cache_path]
+
+dnscontrol_version = "3.20.0"
+
+remote_file "#{cache_dir}/dnscontrol_amd64.deb" do
+  source "https://github.com/StackExchange/dnscontrol/releases/download/v#{dnscontrol_version}/dnscontrol_#{dnscontrol_version}_amd64.deb"
   owner "root"
   group "root"
-  mode "755"
+  mode "644"
+  backup false
+end
+
+dpkg_package "dnscontrol" do
+  action :nothing
+  source "#{cache_dir}/dnscontrol_amd64.deb"
+  subscribes :install, "remote_file[#{cache_dir}/dnscontrol_amd64.deb]"
+end
+
+file "/usr/local/bin/dnscontrol" do
+  action :delete
 end
 
 directory "/srv/dns.openstreetmap.org" do
@@ -128,6 +142,15 @@ template "/var/lib/dns/creds.json" do
   variables :passwords => passwords
 end
 
+template "/var/lib/dns/include/geo.js" do
+  source "geo.js.erb"
+  owner "git"
+  group "git"
+  mode "440"
+  variables :geoservers => geoservers
+  only_if { ::Dir.exist?("/var/lib/dns/include") }
+end
+
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"