X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..558691451db4f029698b996d7df8c8cf272b3b8b:/cookbooks/dns/recipes/default.rb

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 8a1f42ea8..98005c41e 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.
@@ -17,35 +17,50 @@
 # limitations under the License.
 #
 
-include_recipe "git"
+include_recipe "accounts"
 include_recipe "apache"
+include_recipe "git"
+
+geoservers = search(:node, "roles:geodns").collect(&:name).sort
 
 passwords = data_bag_item("dns", "passwords")
 
 package %w[
   make
+  parallel
+  rsync
   perl
+  libdigest-sha-perl
+  libjson-xs-perl
+  libwww-perl
   libxml-treebuilder-perl
   libxml-writer-perl
-  libyaml-perl
-  libwww-perl
-  libjson-xs-perl
+  libyaml-libyaml-perl
+  lockfile-progs
 ]
 
+remote_file "/usr/local/bin/dnscontrol" do
+  action :create
+  source "https://github.com/StackExchange/dnscontrol/releases/download/v3.12.0/dnscontrol-Linux"
+  owner "root"
+  group "root"
+  mode "755"
+end
+
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
 remote_directory "/srv/dns.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
   files_owner "root"
   files_group "root"
-  files_mode 0o644
+  files_mode "644"
 end
 
 zones = []
@@ -57,7 +72,7 @@ Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
     source "zone.html.erb"
     owner "root"
     group "root"
-    mode 0o644
+    mode "644"
     variables :zone => zone
   end
 
@@ -68,26 +83,27 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
   variables :zones => zones
 end
 
 ssl_certificate "dns.openstreetmap.org" do
-  domains "dns.openstreetmap.org"
+  domains ["dns.openstreetmap.org", "dns.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
 apache_site "dns.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
+  variables :aliases => ["dns.osm.org"]
 end
 
 template "/usr/local/bin/dns-update" do
   source "dns-update.erb"
   owner "root"
   group "git"
-  mode 0o750
-  variables :passwords => passwords
+  mode "750"
+  variables :passwords => passwords, :geoservers => geoservers
 end
 
 execute "dns-update" do
@@ -100,28 +116,46 @@ end
 directory "/var/lib/dns" do
   owner "git"
   group "git"
-  mode 0o2775
+  mode "2775"
   notifies :run, "execute[dns-update]"
 end
 
+template "/var/lib/dns/creds.json" do
+  source "creds.json.erb"
+  owner "git"
+  group "git"
+  mode "440"
+  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"
   group "git"
-  mode 0o750
+  mode "750"
+  only_if { ::Dir.exist?("#{node[:dns][:repository]}/hooks") }
 end
 
 template "/usr/local/bin/dns-check" do
   source "dns-check.erb"
   owner "root"
   group "git"
-  mode 0o750
-  variables :passwords => passwords
+  mode "750"
+  variables :passwords => passwords, :geoservers => geoservers
 end
 
-template "/etc/cron.d/dns" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+cron_d "dns" do
+  minute "*/3"
+  user "git"
+  command "/usr/local/bin/dns-check"
+  mailto "admins@openstreetmap.org"
 end