imagery: do not use abc subdomains in js

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index d25c4573177fe57c43fa6ba8fbfba110eda859e0..bbd70fd2c8be9785b220bf9d955be9d10f20a6fc 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -35,13 +35,14 @@ package %w[
   libwww-perl
   libxml-treebuilder-perl
   libxml-writer-perl
+  libyaml-perl
   libyaml-libyaml-perl
   lockfile-progs
 ]
 
 cache_dir = Chef::Config[:file_cache_path]
 
-dnscontrol_version = "3.21.0"
+dnscontrol_version = "4.6.0"
 
 dnscontrol_arch = if arm?
                     "arm64"
@@ -58,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
@@ -173,12 +173,9 @@ systemd_service "dns-check" do
   description "Rebuild DNS zones with GeoDNS changes"
   exec_start "/usr/local/bin/dns-check"
   user "git"
-  private_tmp true
-  private_devices true
-  protect_system "strict"
-  protect_home true
+  sandbox :enable_network => true
+  proc_subset "all"
   read_write_paths "/var/lib/dns"
-  no_new_privileges true
 end
 
 systemd_timer "dns-check" do