Order renderd munin graphs consistently

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index e3ecd1518fd2c9271f4b833a6adc68758df53008..2ab8769cee3d1e7f796d88accff8e85f4435db60 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -6,9 +6,9 @@ default_attributes(
     :users => {
       :tile => {
         :status => :role,
-        :members => [ :jburgess, :tomh ]
-      },
-    },
+        :members => [:jburgess, :tomh]
+      }
+    }
   },
   :apache => {
     :mpm => "event",
@@ -22,11 +22,20 @@ default_attributes(
       :max_requests_per_child => 100000
     }
   },
-  :apt => {
-    :sources => [ "ubuntugis-stable" ]
+  :munin => {
+    :plugins => {
+      :renderd_processed => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk dropped"
+      },
+      :renderd_queue => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk"
+      },
+      :renderd_queue_time => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk"
+      }
+    }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :defaults => {
         :temp_buffers => "32MB",
@@ -34,7 +43,8 @@ default_attributes(
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
-        :checkpoint_segments => "60"
+        :checkpoint_segments => "60",
+        :max_wal_size => "2880MB"
       }
     }
   },
@@ -54,9 +64,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "9.1/main"
-    },
     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
@@ -69,21 +76,23 @@ 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"
       },
-      :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
+      },
+      :antarctica_icesheet_polygons => {
+        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip",
+        :refresh => true
+      },
+      :antarctica_icesheet_outlines => {
+        :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip",
+        :refresh => true
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v2.25.0",
+        :revision => "v2.43.0",
         :max_zoom => 19
       }
     }