From 0c64fb55dcf9b46285b764b349cc6b26cd026460 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 8 May 2026 19:51:45 +0100 Subject: [PATCH] Debian 13 uses mapnik 4.0 --- cookbooks/tile/attributes/default.rb | 8 +++++++- cookbooks/tile/templates/default/renderd.conf.erb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb index 89ec0ce89..e28797200 100644 --- a/cookbooks/tile/attributes/default.rb +++ b/cookbooks/tile/attributes/default.rb @@ -2,7 +2,13 @@ default[:tile][:database][:cluster] = "18/main" default[:tile][:database][:postgis] = "3" default[:tile][:database][:node_file] = "/store/database/nodes" -default[:tile][:mapnik] = "3.1" +if node.platform?("debian") && node[:lsb][:release].to_f > 12 + default[:tile][:mapnik] = "4.0" + default[:tile][:mapnik_plugins_dir] = "#{node[:systemd_paths][:"system-library-arch"]}/mapnik/4.0/input" +else + default[:tile][:mapnik] = "3.1" + default[:tile][:mapnik_plugins_dir] = "/usr/lib/mapnik/3.1/input" +end default[:tile][:replication][:directory] = "/var/lib/replicate" default[:tile][:replication][:url] = "https://osm-planet-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com/planet/replication/minute" diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb index 40b86ad74..27fbcda48 100644 --- a/cookbooks/tile/templates/default/renderd.conf.erb +++ b/cookbooks/tile/templates/default/renderd.conf.erb @@ -7,7 +7,7 @@ tile_dir=/srv/tile.openstreetmap.org/tiles stats_file=/run/renderd/renderd.stats [mapnik] -plugins_dir=/usr/lib/mapnik/<%= node[:tile][:mapnik] %>/input +plugins_dir=<%= node[:tile][:mapnik_plugins_dir] %> font_dir=/usr/share/fonts font_dir_recurse=true <% node[:tile][:styles].each do |name,details| -%> -- 2.39.5