Merge pull request #308 from Firefishy/more-404-tiles

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index a78d1d5fc952e583d924c30377fbec368f7a1e86..a37b8b157a38f0196a28fca5ea305a520046b41f 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: dns
+# Cookbook:: dns

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -20,18 +20,31 @@
 include_recipe "git"
 include_recipe "apache"
 
 include_recipe "git"
 include_recipe "apache"
 

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

 passwords = data_bag_item("dns", "passwords")
 
 package %w[
   make
 passwords = data_bag_item("dns", "passwords")
 
 package %w[
   make

+  parallel
+  rsync

   perl
   libxml-treebuilder-perl
   libxml-writer-perl
   libyaml-perl
   libwww-perl
   libjson-xs-perl
   perl
   libxml-treebuilder-perl
   libxml-writer-perl
   libyaml-perl
   libwww-perl
   libjson-xs-perl

+  sshfp

 ]
 
 ]
 

+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"
   group "root"
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"


@@ -88,7 +101,7 @@ template "/usr/local/bin/dns-update" do
   owner "root"
   group "git"
   mode 0o750
   owner "root"
   group "git"
   mode 0o750

-  variables :passwords => passwords
+  variables :passwords => passwords, :geoservers => geoservers

 end
 
 execute "dns-update" do
 end
 
 execute "dns-update" do


@@ -105,6 +118,14 @@ directory "/var/lib/dns" do
   notifies :run, "execute[dns-update]"
 end
 
   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
+

 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"


@@ -117,7 +138,7 @@ template "/usr/local/bin/dns-check" do
   owner "root"
   group "git"
   mode 0o750
   owner "root"
   group "git"
   mode 0o750

-  variables :passwords => passwords
+  variables :passwords => passwords, :geoservers => geoservers

 end
 
 template "/etc/cron.d/dns" do
 end
 
 template "/etc/cron.d/dns" do