Explicitly set number of osm2pgsql processes

[chef.git] / cookbooks / tile / templates / default / apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index ac4ba8f1270488d5ca65a272dbdc549141cdbcee..66d9dd83709253b541e0ba9e0907b329b2ce2a62 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -4,6 +4,8 @@
   # Basic server configuration
   ServerName <%= node[:fqdn] %>
   ServerAlias tile.openstreetmap.org
+  ServerAlias render.openstreetmap.org
+  ServerAlias *.render.openstreetmap.org
   ServerAlias parent.tile.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
 
@@ -24,7 +26,8 @@
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
-  #Set Access-Control-Allow-Origin header to allow Cross-origin resource sharing (CORS)
+  # Always set Access-Control-Allow-Origin so that simple CORS requests
+  # will always work and can be cached
   Header set Access-Control-Allow-Origin "*"
 
   # Enable the rewrite engine
@@ -39,19 +42,16 @@
   Redirect /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
   Redirect /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
   Redirect /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
-
 </VirtualHost>
 
 <Directory /srv/tile.openstreetmap.org/html>
   Options None
   AllowOverride None
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>
 
 <Directory /srv/tile.openstreetmap.org/cgi-bin>
   Options ExecCGI
   AllowOverride None
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>