Allow AWS DNS queries through the firewall

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 877103b2e4cf46756be2dc0da71ab8442d48041e..1392191d7922898cce036696c619af8fd5dadae9 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -35,30 +35,32 @@ package %w[
   libwww-perl
   libxml-treebuilder-perl
   libxml-writer-perl
   libwww-perl
   libxml-treebuilder-perl
   libxml-writer-perl

+  libyaml-perl

   libyaml-libyaml-perl
   lockfile-progs
 ]
 
 cache_dir = Chef::Config[:file_cache_path]
 
   libyaml-libyaml-perl
   lockfile-progs
 ]
 
 cache_dir = Chef::Config[:file_cache_path]
 

-dnscontrol_version = "3.19.0"
+dnscontrol_version = "3.27.1"

 
 

-remote_file "#{cache_dir}/dnscontrol_amd64.deb" do
-  source "https://github.com/StackExchange/dnscontrol/releases/download/v#{dnscontrol_version}/dnscontrol_#{dnscontrol_version}_amd64.deb"
+dnscontrol_arch = if arm?
+                    "arm64"
+                  else
+                    "amd64"
+                  end
+
+remote_file "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb" do
+  source "https://github.com/StackExchange/dnscontrol/releases/download/v#{dnscontrol_version}/dnscontrol-#{dnscontrol_version}.#{dnscontrol_arch}.deb"

   owner "root"
   group "root"
   mode "644"
   backup false
 end
 
   owner "root"
   group "root"
   mode "644"
   backup false
 end
 

-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
+dpkg_package "dnscontrol" do
+  source "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb"
+  version "#{dnscontrol_version}"

 end
 
 directory "/srv/dns.openstreetmap.org" do
 end
 
 directory "/srv/dns.openstreetmap.org" do


@@ -167,9 +169,21 @@ template "/usr/local/bin/dns-check" do
   variables :passwords => passwords, :geoservers => geoservers
 end
 
   variables :passwords => passwords, :geoservers => geoservers
 end
 

-cron_d "dns" do
-  minute "*/3"
+systemd_service "dns-check" do
+  description "Rebuild DNS zones with GeoDNS changes"
+  exec_start "/usr/local/bin/dns-check"

   user "git"
   user "git"

-  command "/usr/local/bin/dns-check"
-  mailto "admins@openstreetmap.org"
+  sandbox :enable_network => true
+  proc_subset "all"
+  read_write_paths "/var/lib/dns"
+end
+
+systemd_timer "dns-check" do
+  description "Rebuild DNS zones with GeoDNS changes"
+  on_boot_sec "3m"
+  on_unit_active_sec "3m"
+end
+
+service "dns-check.timer" do
+  action [:enable, :start]

 end
 end