X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9302cec0aab75609f536109ac0c10f3a44a204ef..45fe31ef4a8d08f0b732d48fb17711ef54a020b9:/cookbooks/web/recipes/rails.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 1f3236caa..e46f9d52b 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -31,11 +31,11 @@ web_passwords = data_bag_item("web", "passwords") db_passwords = data_bag_item("db", "passwords") ssl_certificate "www.openstreetmap.org" do - domains ["www.openstreetmap.org", "www.osm.org", + domains ["www.openstreetmap.org", "www.osm.org", "www.openstreetmap.com", "api.openstreetmap.org", "api.osm.org", "maps.openstreetmap.org", "maps.osm.org", "mapz.openstreetmap.org", "mapz.osm.org", - "openstreetmap.org", "osm.org"] + "openstreetmap.org", "osm.org", "openstreetmap.com"] notifies :reload, "service[apache2]" end @@ -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