Merge remote-tracking branch 'github/pull/711'

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index ad4e5a8ef6c38303f52f8361bfd3f55b99ce4f20..d57cee6a357a971dfdd8904a61e5eb789549cbd2 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -99,7 +99,7 @@ end
 python_package "tilekiln" do
   python_virtualenv tilekiln_directory
   python_version "3"
-  version "0.6.2"
+  version "0.6.3"
 end
 
 template "/srv/vector.openstreetmap.org/html/index.html" do

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index ee24dbd8da207273ed82d0f0b0bf3dabf1928058..e46f9d52b2506d7e1bff1e30b56f597579cc588e 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -161,7 +161,9 @@ rails_port "www.openstreetmap.org" do
     ".*\\.mapy\\.cz.*",
     # Blacklist Yandex
     ".*\\.api-maps\\.yandex\\.ru/.*",
-    ".*\\.maps\\.yandex\\.net/.*"
+    ".*\\.maps\\.yandex\\.net/.*",
+    # Blacklist 2gis
+    ".*\\.maps\\.2gis\\.com/.*"
   ]
 end