Merge pull request #344 from Firefishy/ignore-vicon-valerus-online-ping

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 9061e2bce33067d0745c9a07520dd985d80566e6..5c06bb5783f9fdacc45e230606683db3ae122a1e 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -5,7 +5,6 @@ default_attributes(
   :accounts => {
     :users => {
       :tile => {
   :accounts => {
     :users => {
       :tile => {

-        :status => :role,

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


@@ -45,12 +44,16 @@ default_attributes(
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",
         :random_page_cost => "1.1",
         :checkpoint_segments => "60",
         :max_wal_size => "2880MB",
         :random_page_cost => "1.1",

+        :jit => "off",

         :track_activity_query_size => "16384",
         :autovacuum_vacuum_scale_factor => "0.05",
         :autovacuum_analyze_scale_factor => "0.02"
       }
     }
   },
         :track_activity_query_size => "16384",
         :autovacuum_vacuum_scale_factor => "0.05",
         :autovacuum_analyze_scale_factor => "0.02"
       }
     }
   },

+  :ssl => {
+    :ct_report_uri => false
+  },

   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",
   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",


@@ -67,6 +70,10 @@ default_attributes(
     }
   },
   :tile => {
     }
   },
   :tile => {

+    :database => {
+      :style_file => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.style",
+      :tag_transform_script => "/srv/tile.openstreetmap.org/styles/default/openstreetmap-carto.lua"
+    },

     :data => {
       :simplified_land_polygons => {
         :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",
     :data => {
       :simplified_land_polygons => {
         :url => "https://osmdata.openstreetmap.de/download/simplified-land-polygons-complete-3857.zip",


@@ -99,8 +106,8 @@ default_attributes(
     },
     :styles => {
       :default => {
     },
     :styles => {
       :default => {

-        :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.25.0",
+        :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
+        :revision => "v5.2.0",

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