X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f2af8a95a4db5c7d46cf47b79621a9357c405e6f..28326173066466bb20f54bad702b2885b64f925c:/cookbooks/dns/recipes/default.rb?ds=inline diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb index 877103b2e..bdd3d7403 100644 --- a/cookbooks/dns/recipes/default.rb +++ b/cookbooks/dns/recipes/default.rb @@ -35,30 +35,33 @@ 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.19.0" +dnscontrol_version = "3.22.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 -package "dnscontrol" do +dpkg_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 + source "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb" + subscribes :install, "remote_file[#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb]" end directory "/srv/dns.openstreetmap.org" do @@ -167,9 +170,21 @@ template "/usr/local/bin/dns-check" do 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" - 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