Disable firewall on tile caches

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 645d107d0e57c7706730e0aae1b4e42c7be61587..75a66f5fda31b3d72c21ca331c684315c13d0030 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,11 +9,10 @@ default_attributes(
       }
     }
   },
-  :apt => {
-    :sources => ["nginx"]
-  },
   :networking => {
-    :tcp_fastopen_key => "tile"
+    :firewall => {
+      :enabled => false
+    }
   },
   :nginx => {
     :access_log => false
@@ -40,19 +39,19 @@ default_attributes(
     :network_local_port_range => {
       :comment => "Increase available local port range",
       :parameters => {
-        "net.ipv4.ip_local_port_range" => "4096 64000"
+        "net.ipv4.ip_local_port_range" => "1024\t65535"
       }
     },
-    :kernel_tfo_listen_enable => {
-      :comment => "Enable TCP Fast Open for listening sockets",
+    :network_tcp_timewait_reuse => {
+      :comment => "Allow tcp timewait reuse",
       :parameters => {
-        "net.ipv4.tcp_fastopen" => 3
+        "net.ipv4.tcp_tw_reuse" => 1
       }
     },
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {
-        "vm.swappiness" => "30"
+        "vm.swappiness" => "1"
       }
     },
     :sched_wakeup => {
@@ -62,6 +61,15 @@ default_attributes(
         "kernel.sched_wakeup_granularity_ns" => "15000000"
       }
     }
+  },
+  :tools => {
+    :cron => {
+      :load => {
+        :nice => 19,
+        :io_scheduling_class => "best-effort",
+        :io_scheduling_priority => 7
+      }
+    }
   }
 )