X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a7d96c8358a00088b485fadb5966eb4b231d2ff1..4d7d82b464dbf2713991e62815502c825b9444d7:/roles/base.rb?ds=sidebyside

diff --git a/roles/base.rb b/roles/base.rb
index 15c913d3d..094190e1a 100644
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -11,14 +11,21 @@ default_attributes(
     }
   },
   :apt => {
-    :sources => [ "openstreetmap" ]
+    :sources => ["openstreetmap"]
+  },
+  :munin => {
+    :plugins => {
+      :ntp_offset => {
+        :offset => { :warning => "100", :critical => "250" }
+      }
+    }
   },
   :networking => {
     :roles => {
       :internal => { :metric => 200, :zone => "loc" },
       :external => { :metric => 100 }
     },
-    :search => [ "openstreetmap.org" ]
+    :search => ["openstreetmap.org"]
   },
   :sysctl => {
     :panic => {
@@ -27,11 +34,14 @@ default_attributes(
     },
     :blackhole => {
       :comment => "Do TCP level MTU probing if we seem to have an ICMP blackhole",
-      :parameters => { "net.ipv4.tcp_mtu_probing" => "1" }
+      :parameters => {
+        "net.ipv4.tcp_mtu_probing" => "1",
+        "net.ipv4.tcp_base_mss" => "1024"
+      }
     },
     :network_buffers => {
       :comment => "Tune network buffers",
-      :parameters => { 
+      :parameters => {
         "net.core.rmem_max" => "16777216",
         "net.core.wmem_max" => "16777216",
         "net.ipv4.tcp_rmem" => "4096\t87380\t16777216",
@@ -44,14 +54,20 @@ default_attributes(
     },
     :network_conntrack_established => {
       :comment => "Only track established connections for four hours",
-      :parameters => { 
+      :parameters => {
         "net.netfilter.nf_conntrack_tcp_timeout_established" => "14400"
       }
     },
     :tcp_syncookies => {
-      :comment => "Turn off syncookies as they interact badly with the firewall",
+      :comment => "Turn on syncookies to protect against SYN floods",
+      :parameters => {
+        "net.ipv4.tcp_syncookies" => "1"
+      }
+    },
+    :default_qdisc => {
+      :comment => "Use pfifo_fast as the default queuing discipline",
       :parameters => {
-        "net.ipv4.tcp_syncookies" => "0"
+        "net.core.default_qdisc" => "pfifo_fast"
       }
     }
   },
@@ -60,7 +76,7 @@ default_attributes(
       :comment => "Tune the ondemand CPU frequency governor",
       :parameters => {
         "devices/system/cpu/cpufreq/ondemand/up_threshold" => "25",
-        "devices/system/cpu/cpufreq/ondemand/sampling_down_factor" => "10"
+        "devices/system/cpu/cpufreq/ondemand/sampling_down_factor" => "100"
       }
     }
   }
@@ -79,5 +95,6 @@ run_list(
   "recipe[openssh]",
   "recipe[sysctl]",
   "recipe[sysfs]",
-  "recipe[tools]"
+  "recipe[tools]",
+  "recipe[fail2ban]"
 )