Don't try and tune nr_requests on jakelong

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

diff --git a/cookbooks/gps-tile/templates/default/apache.erb b/cookbooks/gps-tile/templates/default/apache.erb
index 12d24d13139e83dd4a40820a56f75b8afced4c89..73564f5438635febd275971aae3d944ef2394d37 100644 (file)
--- a/cookbooks/gps-tile/templates/default/apache.erb
+++ b/cookbooks/gps-tile/templates/default/apache.erb
@@ -4,6 +4,8 @@
 <VirtualHost *:<%= port %>>
   # Basic server configuration
   ServerName <%= node[:fqdn] %>
 <VirtualHost *:<%= port %>>
   # Basic server configuration
   ServerName <%= node[:fqdn] %>

+  ServerAlias gps.tile.openstreetmap.org
+  ServerAlias gps-*.tile.openstreetmap.org

   ServerAlias gps-tile.openstreetmap.org
   ServerAlias *.gps-tile.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org
   ServerAlias gps-tile.openstreetmap.org
   ServerAlias *.gps-tile.openstreetmap.org
   ServerAdmin webmaster@openstreetmap.org


@@ -36,6 +38,11 @@
 <Directory /srv/gps-tile.openstreetmap.org/html>
   Options None
   AllowOverride None
 <Directory /srv/gps-tile.openstreetmap.org/html>
   Options None
   AllowOverride None

-  Order allow,deny
-  Allow from all
+  Require all granted
+</Directory>
+
+<Directory /srv/gps-tile.openstreetmap.org/updater>
+  <Files tile>
+    Require all granted
+  </Files>

 </Directory>
 </Directory>