Add a comment indicating where imagery blacklist requests come from

[chef.git] / roles / tile.rb

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

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

       :tile => {
         :members => [:jburgess, :tomh, :pnorman]
       }
       :tile => {
         :members => [:jburgess, :tomh, :pnorman]
       }


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

-      :server_limit => 80,
-      :max_request_workers => 1200,

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

-      :max_spare_threads => 1200,

       :max_connections_per_child => 0,
       :async_request_worker_factor => 4,
       :max_connections_per_child => 0,
       :async_request_worker_factor => 4,

-      :listen_cores_buckets_ratio => 6
+      :listen_cores_buckets_ratio => 8

     }
   },
   :munin => {
     }
   },
   :munin => {


@@ -37,15 +34,17 @@ default_attributes(
     :settings => {
       :defaults => {
         :max_connections => "250",
     :settings => {
       :defaults => {
         :max_connections => "250",

-        :temp_buffers => "32MB",
+        :shared_buffers => "16GB",

         :work_mem => "128MB",
         :work_mem => "128MB",

+        :maintenance_work_mem => "8GB",

         :max_parallel_workers_per_gather => "0",
         :max_parallel_workers_per_gather => "0",

+        :wal_level => "minimal",

         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",

+        :checkpoint_timeout => "60min",

         :commit_delay => "10000",
         :commit_delay => "10000",

-        :checkpoint_segments => "60",
-        :max_wal_size => "2880MB",
-        :random_page_cost => "1.1",
+        :max_wal_size => "10GB",
+        :max_wal_senders => "0",

         :jit => "off",
         :track_activity_query_size => "16384",
         :autovacuum_vacuum_scale_factor => "0.05",
         :jit => "off",
         :track_activity_query_size => "16384",
         :autovacuum_vacuum_scale_factor => "0.05",


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

-        :revision => "v5.6.1",
+        :revision => "v5.7.0",

         :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
         :max_zoom => 19
       }
         :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
         :max_zoom => 19
       }