nftables: allow 169.254.169.0/24 and set log level to notice

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 6bb3dc9023f340283e70f1fc77e14d50a3562743..20bded97ff13fd0d2fcf2f6161408dc91950244d 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -13,6 +13,9 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :timeout => 60,
   :apache => {
     :mpm => "event",
     :timeout => 60,

+    :evasive => {
+      :enable => false
+    },

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


@@ -21,27 +24,20 @@ default_attributes(
       :listen_cores_buckets_ratio => 8
     }
   },
       :listen_cores_buckets_ratio => 8
     }
   },

-  :munin => {
-    :plugins => {
-      :renderd_processed => {
-        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
-        :reqPrio => { :draw => "AREA" },
-        :req => { :draw => "STACK" }
-      }
-    }
-  },

   :postgresql => {
     :settings => {
       :defaults => {
         :max_connections => "250",
   :postgresql => {
     :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",
         :wal_level => "minimal",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :max_parallel_workers_per_gather => "0",
         :wal_level => "minimal",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",

+        :checkpoint_timeout => "60min",

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

-        :max_wal_size => "2880MB",
+        :max_wal_size => "10GB",

         :max_wal_senders => "0",
         :jit => "off",
         :track_activity_query_size => "16384",
         :max_wal_senders => "0",
         :jit => "off",
         :track_activity_query_size => "16384",


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

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

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

+        :functions_script => "/srv/tile.openstreetmap.org/styles/default/functions.sql",

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