Reduce memory cache size on necrosan

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 8a1f42ea85c69d8ac347a83f4340d8ca860428bc..1896e99b82e99d0049e2ad6d8a2384f2111f222a 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,10 +20,14 @@
 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
   perl
   libxml-treebuilder-perl
   libxml-writer-perl


@@ -73,13 +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"
+  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