Install hpricot gem for API munin plugins

[chef.git] / cookbooks / web / recipes / rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 9b0c54974b8f358f1c4246daed678632f3de53bb..7f025493bbf3e0176886d53ba0bcdbf500f45f15 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -23,16 +23,19 @@ 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"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 rails_directory = "#{node[:web][:base_directory]}/rails"
@@ -60,7 +63,8 @@ rails_port "www.openstreetmap.org" do
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
-  memcache_servers %w(rails1 rails2 rails3)
+  logstash_path "#{node[:web][:log_directory]}/rails-logstash.log"
+  memcache_servers node[:web][:memcached_servers]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
@@ -68,6 +72,20 @@ 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"]
+  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 0o755
 end
 
 gem_package "apachelogregex"
@@ -77,14 +95,14 @@ template "/usr/local/bin/api-statistics" do
   source "api-statistics.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/init.d/api-statistics" do
   source "api-statistics.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "api-statistics" do
@@ -94,6 +112,8 @@ service "api-statistics" do
   subscribes :restart, "template[/etc/init.d/api-statistics]"
 end
 
+gem_package "hpricot"
+
 munin_plugin "api_calls_status"
 munin_plugin "api_calls_num"