Switch nidhogg, ridgeback and rimfaxe to squid 4

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 9ad4d829fe5a97f9ba3f508a075cb39ee943d7f2..407d7991f3349c56f65dc2a82d204a3921446e58 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -6,35 +6,47 @@ default_attributes(
     :users => {
       :tile => {
         :status => :role,
     :users => {
       :tile => {
         :status => :role,

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

   },
   :apache => {
     :mpm => "event",
     :timeout => 60,
     :event => {
       :server_limit => 60,
   },
   :apache => {
     :mpm => "event",
     :timeout => 60,
     :event => {
       :server_limit => 60,

-      :max_clients => 1200,
+      :max_request_workers => 1200,

       :threads_per_child => 20,
       :threads_per_child => 20,

-      :min_spare_threads => 30,
-      :max_spare_threads => 180,
-      :max_requests_per_child => 100000
+      :min_spare_threads => 300,
+      :max_spare_threads => 1200,
+      :max_connections_per_child => 0,
+      :async_request_worker_factor => 4

     }
   },
     }
   },

-  :apt => {
-    :sources => [ "ubuntugis-stable" ]
+  :munin => {
+    :plugins => {
+      :renderd_processed => {
+        :graph_order => "reqPrio req reqLow dirty reqBulk dropped",
+        :reqPrio => { :draw => "AREA" },
+        :req => { :draw => "STACK" }
+      }
+    }

   },
   :postgresql => {
   },
   :postgresql => {

-    :versions => [ "9.1" ],

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

+        :max_connections => "250",

         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",
         :temp_buffers => "32MB",
         :work_mem => "128MB",
         :wal_buffers => "1024kB",
         :wal_writer_delay => "500ms",
         :commit_delay => "10000",

-        :checkpoint_segments => "60"
+        :checkpoint_segments => "60",
+        :max_wal_size => "2880MB",
+        :random_page_cost => "1.1",
+        :track_activity_query_size => "16384",
+        :autovacuum_vacuum_scale_factor => "0.05",
+        :autovacuum_analyze_scale_factor => "0.02"

       }
     }
   },
       }
     }
   },


@@ -54,36 +66,40 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :tile => {

-    :database => {
-      :cluster => "9.1/main"
-    },

     :data => {
     :data => {

-      :world_boundaries => {
-        :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
-      },

       :simplified_land_polygons => {
       :simplified_land_polygons => {

-        :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip",
+        :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
+        :refresh => true
+      },
+      :simplified_water_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/simplified-water-polygons-split-3857.zip",

         :refresh => true
       },
       :admin_boundaries => {
         :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"
       },
         :refresh => true
       },
       :admin_boundaries => {
         :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 => {
       :land_polygons => {

-        :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip",
+        :url => "https://osmdata.openstreetmap.de/download/land-polygons-split-3857.zip",
+        :refresh => true
+      },
+      :water_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/water-polygons-split-3857.zip",
+        :refresh => true
+      },
+      :antarctica_icesheet_polygons => {
+        :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-polygons-3857.zip",
+        :refresh => true
+      },
+      :antarctica_icesheet_outlines => {
+        :url => "https://osmdata.openstreetmap.de/download/antarctica-icesheet-outlines-3857.zip",

         :refresh => true
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
         :refresh => true
       }
     },
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v2.15.0",
+        :revision => "v4.23.0",

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