X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2a77f46be65691b76d8ef69b074872ac3ee03356..e7c80fef865721ee88c77f3dae111f19a0958b7a:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 851e41d1c..9fab99c30 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,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" + 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"] @@ -72,7 +76,7 @@ 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"] - nominatim_url "//poldi.openstreetmap.org/" + mapzen_valhalla_key web_passwords["mapzen_valhalla_key"] end gem_package "apachelogregex"