From: Tom Hughes <tom@compton.nu>
Date: Tue, 22 Jun 2021 21:26:27 +0000 (+0100)
Subject: Disable default mod_tile configuration
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/dad206335d841720939ac97b6ea90307db2976e6

Disable default mod_tile configuration
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 0f8cd9303..d31b0bc3c 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -41,6 +41,10 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
+apache_conf "renderd" do
+  action :disable
+end
+
 ssl_certificate node[:fqdn] do
   domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
@@ -56,7 +60,11 @@ tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 fastlyips = JSON.parse(IO.read("#{Chef::Config[:file_cache_path]}/fastly-ip-list.json"))
 
 apache_site "default" do
-  action [:disable]
+  action :disable
+end
+
+apache_site "tileserver_site" do
+  action :disable
 end
 
 apache_site "tile.openstreetmap.org" do