Bring ramoth's watchdog under chef control

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 3f3f3f08d6a6a49a6a0cf56fa9eca8f01c5da126..8e1262e81a20c2da7ba4e4f519960a288fdc513a 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -2,8 +2,8 @@ name "tilecache"
 description "Role applied to all tile cache servers"
 
 default_attributes(
 description "Role applied to all tile cache servers"
 
 default_attributes(

-  :ssl => {
-    :certificate => "tile.openstreetmap"
+  :apt => {
+    :sources => [ "nginx" ]

   },
   :sysctl => {
     :network_conntrack_time_wait => {
   },
   :sysctl => {
     :network_conntrack_time_wait => {


@@ -12,6 +12,12 @@ default_attributes(
         "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
       }
     },
         "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"
+      }
+    },

     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => { 
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => { 


@@ -23,6 +29,5 @@ default_attributes(
 
 run_list(
   "role[geodns]",
 
 run_list(
   "role[geodns]",

-  "recipe[ssl]",

   "recipe[tilecache]"
 )
   "recipe[tilecache]"
 )