Drop sshfp and add some extra perl modules

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 6bf913cb3745cb894431ffefe3855752cffc0a38..cfdd1318e32ffd8408f878244fcdc5c7d5cfc4f6 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -29,20 +29,22 @@ package %w[
   parallel
   rsync
   perl
+  libdigest-sha-perl
+  libjson-xs-perl
+  libwww-perl
   libxml-treebuilder-perl
   libxml-writer-perl
-  libyaml-perl
-  libwww-perl
-  libjson-xs-perl
+  libyaml-libyaml-perl
+  lockfile-progs
 ]
 
-# remote_file "/usr/local/bin/dnscontrol" do
-#   action :create
-#   source "https://github.com/StackExchange/dnscontrol/releases/download/v2.10.0/dnscontrol-Linux"
-#   owner "root"
-#   group "root"
-#   mode 0o755
-# end
+remote_file "/usr/local/bin/dnscontrol" do
+  action :create
+  source "https://github.com/StackExchange/dnscontrol/releases/download/v3.0.0/dnscontrol-Linux"
+  owner "root"
+  group "root"
+  mode 0o755
+end
 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
@@ -103,13 +105,6 @@ template "/usr/local/bin/dns-update" do
   variables :passwords => passwords, :geoservers => geoservers
 end
 
-cookbook_file "/usr/local/bin/dns-update-sshfp" do
-  source "dns-update-sshfp"
-  owner "git"
-  group "git"
-  mode 0o750
-end
-
 execute "dns-update" do
   action :nothing
   command "/usr/local/bin/dns-update"
@@ -132,14 +127,6 @@ template "/var/lib/dns/creds.json" do
   variables :passwords => passwords
 end
 
-execute "dns-update-sshfp" do
-  action :nothing
-  command "/usr/local/bin/dns-update-sshfp"
-  user "git"
-  group "git"
-  subscribes :run, "template[/etc/ssh/ssh_known_hosts]"
-end
-
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"