X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/92d4fd1e5f12a09f6937872834cc048b91e3e7fc..45fe31ef4a8d08f0b732d48fb17711ef54a020b9:/cookbooks/web/recipes/rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 7d39696dc..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
 
@@ -162,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
 
@@ -231,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