X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b53cbecada759e3169a483989fc50d9e2a5c25c0..269b5b28ccf95dd4b96cac3f51168ea3280c83db:/cookbooks/dns/recipes/default.rb diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb index ac404488b..6bf913cb3 100644 --- a/cookbooks/dns/recipes/default.rb +++ b/cookbooks/dns/recipes/default.rb @@ -36,13 +36,13 @@ package %w[ libjson-xs-perl ] -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/v2.10.0/dnscontrol-Linux" +# owner "root" +# group "root" +# mode 0o755 +# end directory "/srv/dns.openstreetmap.org" do owner "root" @@ -103,6 +103,13 @@ 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" @@ -125,6 +132,14 @@ 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"