Go back to serving http tiles directly from squid for now

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 0c54aae82c23026013a849a13242ccb9fc449836..f290f730d22b16f7f1174f435a03dc0e3552d064 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -12,7 +12,7 @@ icp_port 3130
 log_icp_queries off
 
 #FIXME - configurable
-http_port 127.0.0.1:8080 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
+http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 
 cache_effective_user proxy
 cache_effective_group proxy

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index f250bb972c6e260293b43245938f55e240139989..0f4f9e5206f711e7c2e8fddd7c6becde9d4e1703 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -1,7 +1,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 upstream tile_cache_backend {
-    server 127.0.0.1:8080;
+    server 127.0.0.1;
 
     keepalive 32;
 }
@@ -88,20 +88,3 @@ server {
       proxy_set_header Pragma $limit_http_pragma;
     }
 }
-
-# Convert all http requests to https
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    server_name _;
-    add_header Access-Control-Allow-Origin *;
-    return 301 https://$host$request_uri;
-}
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name ~^(?<subdomain>(?:[a-d]\.)?tile)\.osm\.org$;
-    add_header Access-Control-Allow-Origin *;
-    return 301 https://$subdomain.openstreetmap.org$request_uri;
-}