From: Tom Hughes <tom@compton.nu>
Date: Sat, 10 Feb 2018 14:44:38 +0000 (+0000)
Subject: Add tile.openstreetmap.org to render server certificates
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/cef4792d54172b6cc5192b93ec117f6ed5b5d238

Add tile.openstreetmap.org to render server certificates
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 74f011cc1..449f38ffb 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -39,7 +39,7 @@ apache_module "tile" do
 end
 
 ssl_certificate node[:fqdn] do
-  domains [node[:fqdn], "render.openstreetmap.org"]
+  domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
   notifies :reload, "service[apache2]"
 end
 
diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 6588ab0b1..2dc5101bc 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -4,8 +4,8 @@
 <VirtualHost *:<%= port %>>
   # Basic server configuration
   ServerName <%= node[:fqdn] %>
+  ServerAlias tile.openstreetmap.org
   ServerAlias render.openstreetmap.org
-  ServerAlias *.render.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
 <% if port == 443 -%>