X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ca91e26c0c3941b95e6d11eecf0ac3c1975d2e35..63989d6c55dc774804fa818fc0ad7c274fc939f5:/cookbooks/dns/recipes/default.rb

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index a78d1d5fc..6f1658977 100644
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: dns
+# Cookbook:: dns
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,18 +20,31 @@
 include_recipe "git"
 include_recipe "apache"
 
+geoservers = search(:node, "roles:geodns").collect(&:name).sort
+
 passwords = data_bag_item("dns", "passwords")
 
 package %w[
   make
+  parallel
+  rsync
   perl
   libxml-treebuilder-perl
   libxml-writer-perl
   libyaml-perl
   libwww-perl
   libjson-xs-perl
+  sshfp
 ]
 
+remote_file "/usr/local/bin/dnscontrol" do
+  action :create
+  source "https://github.com/StackExchange/dnscontrol/releases/download/v2.11/dnscontrol-Linux"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"
@@ -88,7 +101,7 @@ template "/usr/local/bin/dns-update" do
   owner "root"
   group "git"
   mode 0o750
-  variables :passwords => passwords
+  variables :passwords => passwords, :geoservers => geoservers
 end
 
 execute "dns-update" do
@@ -105,6 +118,14 @@ directory "/var/lib/dns" do
   notifies :run, "execute[dns-update]"
 end
 
+template "/var/lib/dns/creds.json" do
+  source "creds.json.erb"
+  owner "git"
+  group "git"
+  mode 0o440
+  variables :passwords => passwords
+end
+
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
@@ -117,7 +138,7 @@ template "/usr/local/bin/dns-check" do
   owner "root"
   group "git"
   mode 0o750
-  variables :passwords => passwords
+  variables :passwords => passwords, :geoservers => geoservers
 end
 
 template "/etc/cron.d/dns" do