Add nominatim base role to pummelzacken

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index c9fa777bb6c9c9cf44bca13b4a4c805fb55225e0..a0b0e4a2322ac65975963d9ef58b5b3ed9b48c90 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -22,6 +22,15 @@ default_attributes(
       :max_requests_per_child => 100000
     }
   },
       :max_requests_per_child => 100000
     }
   },

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

   :postgresql => {
     :settings => {
       :defaults => {
   :postgresql => {
     :settings => {
       :defaults => {


@@ -30,7 +39,8 @@ default_attributes(
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",

-        :checkpoint_segments => "60"
+        :checkpoint_segments => "60",
+        :max_wal_size => "2880MB"

       }
     }
   },
       }
     }
   },


@@ -62,12 +72,6 @@ default_attributes(
         :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },
         :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/ne_110m_admin_0_boundary_lines_land.zip",
         :directory => "ne_110m_admin_0_boundary_lines_land"
       },

-      :populated_places => {
-        :url => "http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_populated_places.zip",
-        :directory => "ne_10m_populated_places",
-        :original => "ne_10m_populated_places.shp",
-        :processed => "ne_10m_populated_places_fixed.shp"
-      },

       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true
       :land_polygons => {
         :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
         :refresh => true


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

-        :revision => "v2.36.0",
+        :revision => "v2.43.0",

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