Update default SSL cipher list and remove tilecache override

[chef.git] / roles / imagery.rb

diff --git a/roles/imagery.rb b/roles/imagery.rb
index 51664ee191b091e93abee437a35fcdd433a90f23..e1d4881a90cc6c58ad115a61083ebe52f4e6abbf 100644 (file)
--- a/roles/imagery.rb
+++ b/roles/imagery.rb
@@ -11,6 +11,9 @@ default_attributes(
       }
     }
   },
+  :apt => {
+    :sources => ["nginx"]
+  },
   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",
@@ -24,13 +27,32 @@ 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,
+        :keys_zone => "fastcgi_cache_zone:256M",
+        :inactive => "45d",
+        :max_size => "51200M"
+      }
     }
   }
 )
 
 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]"
 )