Add support for configuring a Mapzen Valhalla API key

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index e131d0b0cf2fb6211b4c07915d63433a952fff39..dd05cf73f9677809b8ebc28f4b0a104ecd9c828b 100644 (file)
--- 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 "apache"
 include_recipe "passenger"
 include_recipe "git"

+include_recipe "nodejs"

 
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
 
 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"
 template "/etc/cron.hourly/passenger" do
   cookbook "web"
   source "passenger.cron.erb"


@@ -60,6 +63,7 @@ rails_port "www.openstreetmap.org" do
   gpx_dir "/store/rails/gpx"
   attachments_dir "/store/rails/attachments"
   log_path "#{node[:web][:log_directory]}/rails.log"
   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"]
   memcache_servers %w(rails1 rails2 rails3)
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]


@@ -68,7 +72,12 @@ 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"
   google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com"
   google_auth_secret web_passwords["google_auth_secret"]
   google_openid_realm "https://www.openstreetmap.org"

-  nominatim_url "//poldi.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"]
+  mapquest_key web_passwords["mapquest_key"]
+  mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]

 end
 
 gem_package "apachelogregex"
 end
 
 gem_package "apachelogregex"