Make all web servers use the IC memcached servers

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

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 47010c722763f2dcab7b29708046c0356b381a95..5b42c978c515bac7d41970654f3f0904a83bf3f6 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -64,7 +64,7 @@ rails_port "www.openstreetmap.org" do
   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)
+  memcache_servers node[:web][:memcached_servers]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
@@ -77,7 +77,6 @@ rails_port "www.openstreetmap.org" do
   windowslive_auth_id "0000000040153C51"
   windowslive_auth_secret web_passwords["windowslive_auth_secret"]
   mapzen_valhalla_key web_passwords["mapzen_valhalla_key"]
-  osrm_url "//api-osrm-routed-production.tilestream.net/viaroute"
 end
 
 package "libjson-xs-perl"