dns: Upgrade to dnscontrol 3.21.0

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 6f1658977d9cf99776edd58d79f17c221ad5bb16..7b8c5b6e7278c3bc06a64d59f52760aea8a0fa82 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -17,8 +17,9 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "git"
+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

+include_recipe "git"

 
 geoservers = search(:node, "roles:geodns").collect(&:name).sort
 
 
 geoservers = search(:node, "roles:geodns").collect(&:name).sort
 


@@ -29,36 +30,53 @@ package %w[
   parallel
   rsync
   perl
   parallel
   rsync
   perl

+  libdigest-sha-perl
+  libjson-xs-perl
+  libwww-perl

   libxml-treebuilder-perl
   libxml-writer-perl
   libxml-treebuilder-perl
   libxml-writer-perl

-  libyaml-perl
-  libwww-perl
-  libjson-xs-perl
-  sshfp
+  libyaml-libyaml-perl
+  lockfile-progs

 ]
 
 ]
 

-remote_file "/usr/local/bin/dnscontrol" do
-  action :create
-  source "https://github.com/StackExchange/dnscontrol/releases/download/v2.11/dnscontrol-Linux"
+cache_dir = Chef::Config[:file_cache_path]
+
+dnscontrol_version = "3.21.0"
+
+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"
   owner "root"
   group "root"

-  mode 0o755
+  mode "644"
+  backup false
+end
+
+dpkg_package "dnscontrol" do
+  action :nothing
+  source "#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb"
+  subscribes :install, "remote_file[#{cache_dir}/dnscontrol-#{dnscontrol_version}.deb]"

 end
 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"
 end
 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 remote_directory "/srv/dns.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"
 end
 
 remote_directory "/srv/dns.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0o644
+  files_mode "644"

 end
 
 zones = []
 end
 
 zones = []


@@ -70,7 +88,7 @@ Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
     source "zone.html.erb"
     owner "root"
     group "root"
     source "zone.html.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :zone => zone
   end
 
     variables :zone => zone
   end
 


@@ -81,7 +99,7 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
   source "index.html.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :zones => zones
 end
 
   variables :zones => zones
 end
 


@@ -100,7 +118,7 @@ template "/usr/local/bin/dns-update" do
   source "dns-update.erb"
   owner "root"
   group "git"
   source "dns-update.erb"
   owner "root"
   group "git"

-  mode 0o750
+  mode "750"

   variables :passwords => passwords, :geoservers => geoservers
 end
 
   variables :passwords => passwords, :geoservers => geoservers
 end
 


@@ -114,7 +132,7 @@ end
 directory "/var/lib/dns" do
   owner "git"
   group "git"
 directory "/var/lib/dns" do
   owner "git"
   group "git"

-  mode 0o2775
+  mode "2775"

   notifies :run, "execute[dns-update]"
 end
 
   notifies :run, "execute[dns-update]"
 end
 


@@ -122,28 +140,52 @@ template "/var/lib/dns/creds.json" do
   source "creds.json.erb"
   owner "git"
   group "git"
   source "creds.json.erb"
   owner "git"
   group "git"

-  mode 0o440
+  mode "440"

   variables :passwords => passwords
 end
 
   variables :passwords => passwords
 end
 

+template "/var/lib/dns/include/geo.js" do
+  source "geo.js.erb"
+  owner "git"
+  group "git"
+  mode "440"
+  variables :geoservers => geoservers
+  only_if { ::Dir.exist?("/var/lib/dns/include") }
+end
+

 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
   group "git"
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
   group "git"

-  mode 0o750
+  mode "750"
+  only_if { ::Dir.exist?("#{node[:dns][:repository]}/hooks") }

 end
 
 template "/usr/local/bin/dns-check" do
   source "dns-check.erb"
   owner "root"
   group "git"
 end
 
 template "/usr/local/bin/dns-check" do
   source "dns-check.erb"
   owner "root"
   group "git"

-  mode 0o750
+  mode "750"

   variables :passwords => passwords, :geoservers => geoservers
 end
 
   variables :passwords => passwords, :geoservers => geoservers
 end
 

-template "/etc/cron.d/dns" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+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
+  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