X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/31e786d715dbb4599a129f5e3bbfdda7c1c54cbb..HEAD:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 670a0a5d6..ee24dbd8d 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 @@ -121,6 +120,8 @@ rails_port "www.openstreetmap.org" do google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com" google_auth_secret web_passwords["google_auth_secret"] google_openid_realm "https://www.openstreetmap.org" + facebook_auth_id "427915424036881" + facebook_auth_secret web_passwords["facebook_auth_secret"] microsoft_auth_id "e34f14f1-f790-40f3-9fa4-3c5f1a027c38" microsoft_auth_secret web_passwords["microsoft_auth_secret"] github_auth_id "acf7da34edee99e35499" @@ -157,7 +158,10 @@ 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/.*" ] end @@ -226,14 +230,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