tilecache: reject request without user-agent (try2)

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 9106f932995bf7ff552411bfead1d4de74c3a482..fcab7573849ee8c0beeded77fc434baa3916578d 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -12,7 +12,7 @@ default_attributes(
     }
   },
   :apt => {
-    :sources => ["nginx"]
+    :sources => ["nginx", "ubuntugis-unstable"]
   },
   :sysctl => {
     :sockets => {
@@ -27,12 +27,21 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
+    },
+    :kernel_tfo_listen_enable => {
+      :comment => "Enable TCP Fast Open for listening sockets",
+      :parameters => {
+        "net.ipv4.tcp_fastopen" => 3
+      }
     }
   },
   :nginx => {
     :cache => {
       :fastcgi => {
-        :enable => true
+        :enable => true,
+        :keys_zone => "fastcgi_cache_zone:256M",
+        :inactive => "45d",
+        :max_size => "51200M"
       }
     }
   }
@@ -40,7 +49,11 @@ default_attributes(
 
 run_list(
   "recipe[imagery::au_agri]",
+  "recipe[imagery::gb_ea]",
   "recipe[imagery::gb_hampshire_aerial]",
   "recipe[imagery::gb_os_sv]",
-  "recipe[imagery::gb_surrey_aerial]"
+  "recipe[imagery::gb_surrey_aerial]",
+  "recipe[imagery::za_ngi_topo]",
+  "recipe[imagery::za_coct_aerial]",
+  "recipe[imagery::na_sgswa_topo]"
 )