Handle interfaces with no address

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 0d94bcfd26a3cfb21048e053f1307cf307527133..16a8af1be66f1f547e97a98307d048e8b0ca45c8 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: tilecache
+# Cookbook:: tilecache

 # 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.


@@ -19,15 +19,18 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

-include_recipe "ssl"
-include_recipe "squid"
+include_recipe "fail2ban"
+include_recipe "munin"

 include_recipe "nginx"
 include_recipe "nginx"

+include_recipe "squid"
+include_recipe "ssl"

 
 package "apache2" do
   action :remove
 end
 
 package %w[
 
 package "apache2" do
   action :remove
 end
 
 package %w[

+  curl

   xz-utils
   openssl
 ]
   xz-utils
   openssl
 ]


@@ -51,6 +54,7 @@ tilecaches.each do |cache|
       dest_ports "3128"
       source_ports "1024:"
     end
       dest_ports "3128"
       source_ports "1024:"
     end

+

     firewall_rule "accept-squid-icp" do
       action :accept
       family "inet"
     firewall_rule "accept-squid-icp" do
       action :accept
       family "inet"


@@ -60,6 +64,7 @@ tilecaches.each do |cache|
       dest_ports "3130"
       source_ports "3130"
     end
       dest_ports "3130"
       source_ports "3130"
     end

+

     firewall_rule "accept-squid-icp-reply" do
       action :accept
       family "inet"
     firewall_rule "accept-squid-icp-reply" do
       action :accept
       family "inet"


@@ -69,6 +74,26 @@ tilecaches.each do |cache|
       dest_ports "3130"
       source_ports "3130"
     end
       dest_ports "3130"
       source_ports "3130"
     end

+
+    firewall_rule "accept-squid-htcp" do
+      action :accept
+      family "inet"
+      source "net:#{address}"
+      dest "fw"
+      proto "udp"
+      dest_ports "4827"
+      source_ports "4827"
+    end
+
+    firewall_rule "accept-squid-htcp-reply" do
+      action :accept
+      family "inet"
+      source "fw"
+      dest "net:#{address}"
+      proto "udp"
+      dest_ports "4827"
+      source_ports "4827"
+    end

   end
 end
 
   end
 end
 


@@ -77,6 +102,8 @@ squid_fragment "tilecache" do
   variables :caches => tilecaches, :renders => tilerenders
 end
 
   variables :caches => tilecaches, :renders => tilerenders
 end
 

+package "rsync"
+

 template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
 template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"


@@ -113,12 +140,16 @@ ssl_certificate "tile.openstreetmap.org" do
   domains ["tile.openstreetmap.org",
            "a.tile.openstreetmap.org",
            "b.tile.openstreetmap.org",
   domains ["tile.openstreetmap.org",
            "a.tile.openstreetmap.org",
            "b.tile.openstreetmap.org",

-           "c.tile.openstreetmap.org"]
+           "c.tile.openstreetmap.org",
+           "tile.osm.org",
+           "a.tile.osm.org",
+           "b.tile.osm.org",
+           "c.tile.osm.org"]

   notifies :restart, "service[nginx]"
 end
 
   notifies :restart, "service[nginx]"
 end
 

-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
+nginx_site "tile" do
+  template "nginx_tile.conf.erb"

   variables :caches => tilecaches
 end
 
   variables :caches => tilecaches
 end
 


@@ -129,6 +160,10 @@ template "/etc/logrotate.d/nginx" do
   mode 0o644
 end
 
   mode 0o644
 end
 

+fail2ban_jail "squid" do
+  maxretry 1000
+end
+

 tilerenders.each do |render|
   munin_plugin "ping_#{render[:fqdn]}" do
     target "ping_"
 tilerenders.each do |render|
   munin_plugin "ping_#{render[:fqdn]}" do
     target "ping_"


@@ -137,6 +172,44 @@ tilerenders.each do |render|
   end
 end
 
   end
 end
 

-Dir.glob("/var/log/nginx/access.log*") do |log|
-  File.unlink(log)
+template "/etc/cron.d/tilecache" do
+  source "cron.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+directory "/srv/tilecache" do
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+directory "/srv/tilecache/data" do
+  owner "www-data"
+  group "www-data"
+  mode 0o755
+end
+
+cookbook_file "/srv/tilecache/tilecache-curl-time.txt" do
+  source "tilecache-curl-time.txt"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+template "/srv/tilecache/tilecache-curl-time" do
+  source "tilecache-curl-time.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+  variables :caches => tilecaches, :renders => tilerenders
+end
+
+file "/srv/tilecache/tilecache-fastest-peers" do
+  action :delete
+end
+
+ohai_plugin "tilecache" do
+  template "ohai.rb.erb"

 end
 end