dns: upgrade dnscontrol to 4.14.1

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index e1233775f3b0ea594b30066bb5519b9cd309231b..468343a89b6b1a38de3baa191f790c35ea313067 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -35,15 +35,20 @@ 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.20.0"
+dnscontrol_version = "4.14.1"

 
 

-dnscontrol_arch = arm? ? "arm64" : "amd64"
+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"
 
 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"


@@ -54,9 +59,8 @@ remote_file "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb" do
 end
 
 dpkg_package "dnscontrol" do
 end
 
 dpkg_package "dnscontrol" do

-  action :nothing

   source "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb"
   source "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb"

-  subscribes :install, "remote_file[#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb]"
+  version "#{dnscontrol_version}"

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


@@ -165,9 +169,22 @@ 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"
+  runtime_max_sec 90
+  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