From 2f6f7c9e4e13750ff0a860b0a24f2ca5099cf44e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 28 May 2025 18:32:35 +0100 Subject: [PATCH] Modernise path to renderd run time directory --- cookbooks/tile/templates/default/render-lowzoom.erb | 2 +- cookbooks/tile/templates/default/renderd.conf.erb | 4 ++-- cookbooks/tile/templates/default/tile.conf.erb | 2 +- cookbooks/tile/templates/default/update-lowzoom.erb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/tile/templates/default/render-lowzoom.erb b/cookbooks/tile/templates/default/render-lowzoom.erb index eb3e2e84e..9ed8f0fc0 100644 --- a/cookbooks/tile/templates/default/render-lowzoom.erb +++ b/cookbooks/tile/templates/default/render-lowzoom.erb @@ -15,7 +15,7 @@ function update_<%= style %> render_old \ --timestamp=${timestamp} \ --tile-dir=/srv/tile.openstreetmap.org/tiles \ - --socket=/var/run/renderd/renderd.sock \ + --socket=/run/renderd/renderd.sock \ --num-threads=<%= @threads %> \ --map="<%= style %>" \ --max-load=<%= node.cpu_cores - 1 %> \ diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb index d29c58aa7..40b86ad74 100644 --- a/cookbooks/tile/templates/default/renderd.conf.erb +++ b/cookbooks/tile/templates/default/renderd.conf.erb @@ -1,10 +1,10 @@ # DO NOT EDIT - This file is being maintained by Chef [renderd] -socketname=/var/run/renderd/renderd.sock +socketname=/run/renderd/renderd.sock num_threads=<%= node.cpu_cores - 1 %> tile_dir=/srv/tile.openstreetmap.org/tiles -stats_file=/var/run/renderd/renderd.stats +stats_file=/run/renderd/renderd.stats [mapnik] plugins_dir=/usr/lib/mapnik/<%= node[:tile][:mapnik] %>/input diff --git a/cookbooks/tile/templates/default/tile.conf.erb b/cookbooks/tile/templates/default/tile.conf.erb index 784733731..19f426fbe 100644 --- a/cookbooks/tile/templates/default/tile.conf.erb +++ b/cookbooks/tile/templates/default/tile.conf.erb @@ -1,7 +1,7 @@ # DO NOT EDIT - This file is being maintained by Chef # Set location of renderd socket -ModTileRenderdSocketName /var/run/renderd/renderd.sock +ModTileRenderdSocketName /run/renderd/renderd.sock # Set location of tile directory ModTileTileDir /srv/tile.openstreetmap.org/tiles diff --git a/cookbooks/tile/templates/default/update-lowzoom.erb b/cookbooks/tile/templates/default/update-lowzoom.erb index 0455493d9..7d50f8662 100644 --- a/cookbooks/tile/templates/default/update-lowzoom.erb +++ b/cookbooks/tile/templates/default/update-lowzoom.erb @@ -11,7 +11,7 @@ function update_tiles render_old \ --timestamp=$(stat -c %Y "/srv/tile.openstreetmap.org/styles/<%= @style %>/project.xml") \ --tile-dir=/srv/tile.openstreetmap.org/tiles \ - --socket=/var/run/renderd/renderd.sock \ + --socket=/run/renderd/renderd.sock \ --num-threads=<%= @threads %> \ --map="<%= @style %>" \ --max-load=<%= node.cpu_cores - 1 %> \ -- 2.39.5