From 5dc4196401aecec1cf07327d78544347dcc730fa Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 12 Mar 2026 18:09:18 +0000 Subject: [PATCH] Drop unused support for legacy carto setups without hstore --- cookbooks/tile/attributes/default.rb | 1 - cookbooks/tile/recipes/default.rb | 1 - cookbooks/tile/templates/default/replicate.erb | 2 -- 3 files changed, 4 deletions(-) diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb index b35d5cedb..3d2464883 100644 --- a/cookbooks/tile/attributes/default.rb +++ b/cookbooks/tile/attributes/default.rb @@ -2,7 +2,6 @@ default[:tile][:database][:cluster] = "17/main" default[:tile][:database][:postgis] = "3" default[:tile][:database][:node_file] = "/store/database/nodes" default[:tile][:database][:multi_geometry] = true -default[:tile][:database][:hstore] = true default[:tile][:database][:style_file] = nil default[:tile][:database][:tag_transform_script] = nil diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 8310cdbe6..0d841974a 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -358,7 +358,6 @@ end postgresql_extension "hstore" do cluster node[:tile][:database][:cluster] database "gis" - only_if { node[:tile][:database][:hstore] } end %w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table| diff --git a/cookbooks/tile/templates/default/replicate.erb b/cookbooks/tile/templates/default/replicate.erb index 531adca83..2a02c271b 100644 --- a/cookbooks/tile/templates/default/replicate.erb +++ b/cookbooks/tile/templates/default/replicate.erb @@ -15,9 +15,7 @@ do <% if node[:tile][:database][:multi_geometry] -%> --multi-geometry \ <% end -%> -<% if node[:tile][:database][:hstore] -%> --hstore \ -<% end -%> <% if node[:tile][:database][:tag_transform_script] -%> --tag-transform-script=<%= node[:tile][:database][:tag_transform_script] %> <% end -%> -- 2.39.5