Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 57d0039523a18835955e305091aeaf92955b3ddd..98005c41ea00c621a8d7a41c9b169ee77870db6f 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -41,7 +41,7 @@ package %w[
 
 remote_file "/usr/local/bin/dnscontrol" do
   action :create
 
 remote_file "/usr/local/bin/dnscontrol" do
   action :create

-  source "https://github.com/StackExchange/dnscontrol/releases/download/v3.8.0/dnscontrol-Linux"
+  source "https://github.com/StackExchange/dnscontrol/releases/download/v3.12.0/dnscontrol-Linux"

   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"


@@ -128,6 +128,15 @@ template "/var/lib/dns/creds.json" do
   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"
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"