X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/dad08a3935eead4f3a531852bd29304c7638b8dc..45fe31ef4a8d08f0b732d48fb17711ef54a020b9:/cookbooks/web/recipes/rails.rb?ds=inline diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index ea0287a97..e46f9d52b 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -21,7 +21,6 @@ include_recipe "apache" include_recipe "apt" include_recipe "git" include_recipe "geoipupdate" -include_recipe "munin" include_recipe "nodejs" include_recipe "passenger" include_recipe "ruby" @@ -32,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 @@ -159,7 +158,12 @@ rails_port "www.openstreetmap.org" do # Blacklist here ".*\\.here\\.com[/:].*", # Blacklist Mapy.cz - ".*\\.mapy\\.cz.*" + ".*\\.mapy\\.cz.*", + # Blacklist Yandex + ".*\\.api-maps\\.yandex\\.ru/.*", + ".*\\.maps\\.yandex\\.net/.*", + # Blacklist 2gis + ".*\\.maps\\.2gis\\.com/.*" ] end @@ -228,14 +232,3 @@ end gem_package "hpricot" do gem_binary node[:ruby][:gem] end - -munin_plugin "api_calls_status" -munin_plugin "api_calls_num" - -munin_plugin "api_calls_#{node[:hostname]}" do - target "api_calls_" -end - -munin_plugin "api_waits_#{node[:hostname]}" do - target "api_waits_" -end