From f4d7ffa4de206890c7ed7a5e91c135d3be442099 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 May 2025 18:39:20 +0100
Subject: [PATCH] Move mod_tile configuration to the virtual host

---
 cookbooks/tile/templates/default/apache.erb   | 33 +++++++++++++++++++
 .../tile/templates/default/tile.conf.erb      | 26 +++++++--------
 2 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index a1c4e1977..50f6b5a97 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -19,6 +19,39 @@
   DocumentRoot /srv/tile.openstreetmap.org/html
   ScriptAlias /cgi-bin/ /srv/tile.openstreetmap.org/cgi-bin/
 
+  # Set location of renderd socket
+  ModTileRenderdSocketName /run/renderd/renderd.sock
+
+  # Set location of tile directory
+  ModTileTileDir /srv/tile.openstreetmap.org/tiles
+
+  # Time to wait for a re-render before serving a dirty tile
+  ModTileRequestTimeout 2
+
+  # Timeout before giving up for a tile to be rendered that is otherwise missing
+  ModTileMissingRequestTimeout 10
+
+  # Always try and re-render dirty or missing tiles
+  ModTileMaxLoadOld 1000
+  ModTileMaxLoadMissing 1000
+
+  # Maximum expiry to set on a tile
+  ModTileCacheDurationMax 604800
+
+  # Expiry time for dirty tiles that have been queued for re-rendering
+  ModTileCacheDurationDirty 900
+
+  # Minimum expiry time for fresh tiles
+  ModTileCacheDurationMinimum 10800
+  ModTileCacheDurationMediumZoom 13 86400
+  ModTileCacheDurationLowZoom 9 518400
+
+  # Factor controlling effect of last modification time on expiry
+  ModTileCacheLastModifiedFactor 0.20
+
+  # Load tile configuration
+  LoadTileConfigFile /etc/renderd.conf
+
   # Get the real remote IP for requests via a trusted proxy
   RemoteIPHeader Fastly-Client-IP
 <% @fastly.sort.each do |address| -%>
diff --git a/cookbooks/tile/templates/default/tile.conf.erb b/cookbooks/tile/templates/default/tile.conf.erb
index 19f426fbe..81c0fa38d 100644
--- a/cookbooks/tile/templates/default/tile.conf.erb
+++ b/cookbooks/tile/templates/default/tile.conf.erb
@@ -1,34 +1,34 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # Set location of renderd socket
-ModTileRenderdSocketName /run/renderd/renderd.sock
+#ModTileRenderdSocketName /run/renderd/renderd.sock
 
 # Set location of tile directory
-ModTileTileDir /srv/tile.openstreetmap.org/tiles
+#ModTileTileDir /srv/tile.openstreetmap.org/tiles
 
 # Time to wait for a re-render before serving a dirty tile
-ModTileRequestTimeout 2
+#ModTileRequestTimeout 2
 
 # Timeout before giving up for a tile to be rendered that is otherwise missing
-ModTileMissingRequestTimeout 10
+#ModTileMissingRequestTimeout 10
 
 # Always try and re-render dirty or missing tiles
-ModTileMaxLoadOld 1000
-ModTileMaxLoadMissing 1000
+#ModTileMaxLoadOld 1000
+#ModTileMaxLoadMissing 1000
 
 # Maximum expiry to set on a tile
-ModTileCacheDurationMax 604800
+#ModTileCacheDurationMax 604800
 
 # Expiry time for dirty tiles that have been queued for re-rendering
-ModTileCacheDurationDirty 900
+#ModTileCacheDurationDirty 900
 
 # Minimum expiry time for fresh tiles
-ModTileCacheDurationMinimum 10800
-ModTileCacheDurationMediumZoom 13 86400
-ModTileCacheDurationLowZoom 9 518400
+#ModTileCacheDurationMinimum 10800
+#ModTileCacheDurationMediumZoom 13 86400
+#ModTileCacheDurationLowZoom 9 518400
 
 # Factor controlling effect of last modification time on expiry
-ModTileCacheLastModifiedFactor 0.20
+#ModTileCacheLastModifiedFactor 0.20
 
 # Load tile configuration
-LoadTileConfigFile /etc/renderd.conf
+#LoadTileConfigFile /etc/renderd.conf
-- 
2.39.5