X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0a45323df4ebd77ecee44788fdd188483e683385..1facaf1dc96ab5b42492334c3170e1232b2f847d:/roles/tilecache.rb

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index 6ae82d476..0b19eb890 100644
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -12,6 +12,13 @@ default_attributes(
   :apt => {
     :sources => ["nginx"]
   },
+  :munin => {
+    :plugins => {
+      :cpu => {
+        :user => { :warning => 200, :critical => 400 }
+      }
+    }
+  },
   :sysctl => {
     :network_conntrack_time_wait => {
       :comment => "Only track completed connections for 30 seconds",
@@ -31,9 +38,6 @@ default_attributes(
         "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"
   }
 )