Redirect http requests to https

[chef.git] / cookbooks / squid / templates / default / squid.conf.erb

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 16c7b4d4dde1f2ae3c073d19f9898c06aa6971c3..0c54aae82c23026013a849a13242ccb9fc449836 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 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
+http_port 127.0.0.1:8080 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 
 cache_effective_user proxy
 cache_effective_group proxy
@@ -21,6 +21,8 @@ cache_effective_group proxy
 cache_dir <%= node[:squid][:cache_dir] %>
 cache_swap_log /var/spool/squid/%s
 
+cache_mgr webmaster@openstreetmap.org
+
 quick_abort_min 0 KB
 quick_abort_max 0 KB
 
@@ -80,11 +82,9 @@ http_access allow purge purge_hosts
 http_access deny purge
 
 forwarded_for on
+follow_x_forwarded_for allow localhost
 
-#Loggin used for analysis
-logformat zerelog %ts.%03tu %rp "%{Etag}<h" %>a "%{User-Agent}>h"
-access_log /var/log/squid/zere.log zerelog
-
+logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03Hs %<st %rm %rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
 access_log <%= node[:squid][:access_log] %>
 cache_log /var/log/squid/cache.log
 cache_store_log none
@@ -94,7 +94,7 @@ strip_query_terms off
 
 digest_generation on
 
-refresh_pattern .              0       20%     4320
+refresh_pattern .              0       50%     8640
 
 #ZERO required for logrotate to work properly
 logfile_rotate 0