Disable the postgres JIT on tile servers

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index f089d08b2574121287bb8327b924e0cbac325d05..d726d29d1ba8c4d1cff9cb99174ef02434682494 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -5,13 +5,12 @@ default_attributes(
   :accounts => {
     :users => {
       :tile => {
-        :status => :role,
         :members => [:jburgess, :tomh]
       }
     }
   },
   :apache => {
-    :mpms => ["event"],
+    :mpm => "event",
     :timeout => 60,
     :event => {
       :server_limit => 60,
@@ -45,12 +44,16 @@ default_attributes(
         :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"
       }
     }
   },
+  :ssl => {
+    :ct_report_uri => false
+  },
   :sysctl => {
     :sockets => {
       :comment => "Increase size of connection queue",
@@ -67,6 +70,10 @@ default_attributes(
     }
   },
   :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",
@@ -99,7 +106,7 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
+        :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
         :revision => "v4.25.0",
         :max_zoom => 19
       }