Stop installing rails code on database servers

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 28f268f90bf2c265db6abef6dfd10de643f76025..9e9f93183552f47ff449550d3310e3353e5753a5 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -42,7 +42,7 @@ package %w[
 
 cache_dir = Chef::Config[:file_cache_path]
 
-dnscontrol_version = "3.27.1"
+dnscontrol_version = "4.12.5"
 
 dnscontrol_arch = if arm?
                     "arm64"
@@ -59,9 +59,8 @@ remote_file "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb" do
 end
 
 dpkg_package "dnscontrol" do
-  action :nothing
   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
@@ -174,6 +173,7 @@ systemd_service "dns-check" do
   description "Rebuild DNS zones with GeoDNS changes"
   exec_start "/usr/local/bin/dns-check"
   user "git"
+  runtime_max_sec 90
   sandbox :enable_network => true
   proc_subset "all"
   read_write_paths "/var/lib/dns"