Revert "Generate a DNS include file for SSHFP records"

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 33ec30277186e3e1aac83ff066ac20f729672b8f..5b4743ef6e12dd3515cdf971fcfdb0c58b5d3cfb 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,10 +20,14 @@
 include_recipe "git"
 include_recipe "apache"
 
+geoservers = search(:node, "roles:geodns").collect(&:name).sort
+
 passwords = data_bag_item("dns", "passwords")
 
 package %w[
   make
+  parallel
+  rsync
   perl
   libxml-treebuilder-perl
   libxml-writer-perl
@@ -32,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"
@@ -73,13 +85,14 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
 end
 
 ssl_certificate "dns.openstreetmap.org" do
-  domains "dns.openstreetmap.org"
+  domains ["dns.openstreetmap.org", "dns.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
 apache_site "dns.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
+  variables :aliases => ["dns.osm.org"]
 end
 
 template "/usr/local/bin/dns-update" do
@@ -87,7 +100,7 @@ template "/usr/local/bin/dns-update" do
   owner "root"
   group "git"
   mode 0o750
-  variables :passwords => passwords
+  variables :passwords => passwords, :geoservers => geoservers
 end
 
 execute "dns-update" do
@@ -104,6 +117,14 @@ 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
+
 cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
@@ -116,7 +137,7 @@ template "/usr/local/bin/dns-check" do
   owner "root"
   group "git"
   mode 0o750
-  variables :passwords => passwords
+  variables :passwords => passwords, :geoservers => geoservers
 end
 
 template "/etc/cron.d/dns" do