X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/523cc1f7b407269fd07c86fc4ab5f6c8c3f7230f..3cc0b6c70b7913d3de8442f8061db2d5f904ee94:/cookbooks/tilecache/templates/default/squid.conf.erb

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index d1478759f..942b4debb 100644
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -67,6 +67,8 @@ acl osmtileOverusers referer_regex ^https?://fastpokemap\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.fastpokemap\.com/
 acl osmtileOverusers referer_regex ^https?://pkget\.com/
 acl osmtileOverusers referer_regex ^https?://[^.]*\.pkget\.com/
+acl osmtileOverusers referer_regex ^https?://twpkinfo\.com/
+acl osmtileOverusers referer_regex ^https?://[^.]*\.twpkinfo\.com/
 
 # Faked OSM referers
 acl osmtileOverusers referer_regex ^http://www\.openstreetmap\.org/?$
@@ -117,11 +119,9 @@ acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
-<% if node[:squid][:version] != 3 -%>
 # Siblings
 <% node[:tilecache][:tile_siblings].each do |sibling| -%>
-cache_peer <%= sibling %> sibling 3128 3130 weight=1500
-<% end -%>
+cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500
 <% end -%>
 
 # Primary Parent
@@ -153,9 +153,14 @@ acl pool_unlimited src <%= address %>
 
 # Juno Minsk office - me@komzpa.net
 acl pool_unlimited src 212.98.173.54
+<% if node[:squid][:version] < 4 -%>
+
+#Allow tile_caches HTCP access
+htcp_access allow tile_caches
 
 #Allow tile_caches ICP access
 icp_access allow tile_caches
+<% end %>
 
 <% (0..127).each do |i| -%>
 acl pool_<%= sprintf("%03d", 2*i) %> src <%= 2*i %>.0.0.0/7