X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/65e6abb07c5af84f4ab23c76321dc202d3ce5947..269b5b28ccf95dd4b96cac3f51168ea3280c83db:/cookbooks/dns/recipes/default.rb diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb index ddc0eb028..6bf913cb3 100644 --- a/cookbooks/dns/recipes/default.rb +++ b/cookbooks/dns/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: dns +# Cookbook:: dns # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -36,6 +36,14 @@ 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 + directory "/srv/dns.openstreetmap.org" do owner "root" group "root" @@ -95,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" @@ -109,6 +124,22 @@ directory "/var/lib/dns" do notifies :run, "execute[dns-update]" end +template "/var/lib/dns/creds.json" do + source "creds.json.erb" + owner "git" + group "git" + mode 0o440 + 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"