Drop role for grisu

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index bb32f24a4c1150140980e529084a886825443765..a30962415e8d572bb5f1dc89e00927b98980d761 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -4,8 +4,9 @@ description "Role applied to all tile servers"
 default_attributes(
   :accounts => {
     :users => {
 default_attributes(
   :accounts => {
     :users => {

+      :pnorman => { :status => :administrator },

       :tile => {
       :tile => {

-        :members => [:jburgess, :tomh]
+        :members => [:jburgess, :tomh, :pnorman]

       }
     }
   },
       }
     }
   },


@@ -13,7 +14,7 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :event => {
     :mpm => "event",
     :timeout => 60,
     :event => {

-      :server_limit => 60,
+      :server_limit => 80,

       :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,
       :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,


@@ -62,6 +63,18 @@ default_attributes(
         "net.core.somaxconn" => 10000
       }
     },
         "net.core.somaxconn" => 10000
       }
     },

+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
+      :parameters => {
+        "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" => "524288"
+      }
+    },

     :no_tcp_slow_start => {
       :comment => "Disable TCP slow start",
       :parameters => {
     :no_tcp_slow_start => {
       :comment => "Disable TCP slow start",
       :parameters => {


@@ -74,7 +87,7 @@ default_attributes(
         "net.core.default_qdisc" => "fq",
         "net.ipv4.tcp_congestion_control" => "bbr"
       }
         "net.core.default_qdisc" => "fq",
         "net.ipv4.tcp_congestion_control" => "bbr"
       }

-    },
+    }

   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {


@@ -92,7 +105,8 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v5.4.0",
+        :revision => "v5.7.0",
+        :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }