Search rank for new namespace

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 4fbde88c06ffa0ddfaaabe0f66c14bc68bc7e0f2..1896e99b82e99d0049e2ad6d8a2384f2111f222a 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
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -18,18 +18,23 @@
 #
 
 include_recipe "git"
 #
 
 include_recipe "git"

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 

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

 
 

-package "make"
+passwords = data_bag_item("dns", "passwords")

 
 

-package "perl"
-package "libxml-treebuilder-perl"
-package "libxml-writer-perl"
-package "libyaml-perl"
-package "libwww-perl"
-package "libjson-xs-perl"
+package %w[
+  make
+  parallel
+  rsync
+  perl
+  libxml-treebuilder-perl
+  libxml-writer-perl
+  libyaml-perl
+  libwww-perl
+  libjson-xs-perl
+]

 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"


@@ -72,14 +77,14 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
 end
 
 ssl_certificate "dns.openstreetmap.org" do
 end
 
 ssl_certificate "dns.openstreetmap.org" do

-  domains "dns.openstreetmap.org"
-  fallback_certificate "openstreetmap"
+  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"
   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
 end
 
 template "/usr/local/bin/dns-update" do


@@ -87,7 +92,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


@@ -116,7 +121,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