X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4410e8b71cae55972a61b251bd39979b9ff77d74:/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb..981b586040b3fe307a4855e58e846da75555aa05:/cookbooks/tilecache/templates/default/nginx_tile.conf.erb

diff --git a/cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
similarity index 94%
rename from cookbooks/tilecache/templates/default/nginx_tile_ssl.conf.erb
rename to cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index ac62a3775..149ddd001 100644
--- a/cookbooks/tilecache/templates/default/nginx_tile_ssl.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;
+    server 127.0.0.1:8080;
     <% @caches.each do |cache| -%>
     <% if cache[:hostname] != node[:hostname] -%>
     #Server <%= cache[:hostname] %>
@@ -96,3 +96,11 @@ 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 _;
+    return 301 https://$host$request_uri;
+}