Use cgimap from PPA rather than building from source.

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 6b23cf30a9c502dcba74db28bd1783f3b9289790..848ac239d334601f553fa2e3ba27134ef5ca7aa9 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -19,6 +19,7 @@
 
 include_recipe "tools"
 include_recipe "web::base"
+include_recipe "web::nfs"
 
 include_recipe "apache"
 include_recipe "passenger"
@@ -76,7 +77,10 @@ rails_port "www.openstreetmap.org" do
   facebook_auth_secret web_passwords["facebook_auth_secret"]
   windowslive_auth_id "0000000040153C51"
   windowslive_auth_secret web_passwords["windowslive_auth_secret"]
+  github_auth_id "acf7da34edee99e35499"
+  github_auth_secret web_passwords["github_auth_secret"]
   mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]
+  thunderforest_key web_passwords["thunderforest_key"]
 end
 
 package "libjson-xs-perl"
@@ -112,6 +116,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"