X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/be5f5bf83260f6fe16c253bb2069b34bd7421549..6fe58fe6451e97e6feb6b9640a4d412425c03ac4:/cookbooks/web/recipes/rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 52a49aee8..632a627cc 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -23,10 +23,13 @@ include_recipe "web::base"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
+include_recipe "nodejs"
 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
+nodejs_package "svgo"
+
 template "/etc/cron.hourly/passenger" do
   cookbook "web"
   source "passenger.cron.erb"
@@ -60,11 +63,29 @@ rails_port "www.openstreetmap.org" do
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
+  logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"
   memcache_servers %w(rails1 rails2 rails3)
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   piwik_configuration piwik_configuration
+  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"]
+  windowslive_auth_id "0000000040153C51"
+  windowslive_auth_secret web_passwords["windowslive_auth_secret"]
+  mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]
+end
+
+package "libjson-xs-perl"
+
+template "/usr/local/bin/cleanup-rails-assets" do
+  source "cleanup-assets.erb"
+  owner "root"
+  group "root"
+  mode 0755
 end
 
 gem_package "apachelogregex"
@@ -90,3 +111,14 @@ service "api-statistics" do
   subscribes :restart, "template[/usr/local/bin/api-statistics]"
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 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