Add tile.openstreetmap.org to render server certificates

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 74f011cc14f3453b030275f0b419ca1664b770e3..449f38ffb83e3fd3093b7f29fe798d1e2199089b 100644 (file)
--- 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 6588ab0b1f981672bde0bcf8350eb549dbd73a60..2dc5101bc0ccaa561f726cddeafa0ad3ad62dfa9 100644 (file)
--- 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 -%>