Track backport branches of osm2pgsql git on irc

[chef.git] / roles / tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 6ae82d476982424557db4ef706394d7729727947..8e6da21eeb45674c4c5ffdedafd18ed9fde333aa 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -12,6 +12,13 @@ default_attributes(
   :apt => {
     :sources => ["nginx"]
   },
   :apt => {
     :sources => ["nginx"]
   },

+  :munin => {
+    :plugins => {
+      :cpu => {
+        :user => { :warning => 200, :critical => 400 }
+      }
+    }
+  },

   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",


@@ -25,15 +32,18 @@ default_attributes(
         "net.netfilter.nf_conntrack_max" => "131072"
       }
     },
         "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 => {
         "vm.swappiness" => "30"
       }
     }
     :squid_swappiness => {
       :comment => "Prefer not to swapout to free memory",
       :parameters => {
         "vm.swappiness" => "30"
       }
     }

-  },
-  :ssl => {
-    :ciphers => "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS"

   }
 )
 
   }
 )