Modernise mapserv-fcgi services

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 3f3f3f08d6a6a49a6a0cf56fa9eca8f01c5da126..8e6da21eeb45674c4c5ffdedafd18ed9fde333aa 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,19 +2,45 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
-  :ssl => {
-    :certificate => "tile.openstreetmap"
+  :accounts => {
+    :groups => {
+      :proxy => {
+        :members => [:tomh, :grant, :matt, :jburgess]
+      }
+    }
+  },
+  :apt => {
+    :sources => ["nginx"]
+  },
+  :munin => {
+    :plugins => {
+      :cpu => {
+        :user => { :warning => 200, :critical => 400 }
+      }
+    }
   },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
-      :parameters => { 
+      :parameters => {
         "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
       }
     },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "131072"
+      }
+    },
+    :kernel_tfo_listen_enable => {
+      :comment => "Enable TCP Fast Open for listening sockets",
+      :parameters => {
+        "net.ipv4.tcp_fastopen" => 3
+      }
+    },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
-      :parameters => { 
+      :parameters => {
         "vm.swappiness" => "30"
       }
     }
@@ -22,7 +48,5 @@ default_attributes(
 )
 
 run_list(
-  "role[geodns]",
-  "recipe[ssl]",
   "recipe[tilecache]"
 )