Switch web site to use MapQuest Nominatim for search

[chef.git] / cookbooks / web / definitions / rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index dbc5c32107a6dbcf4b3be501b2e960cd18c5a508..6b77fd441b5b6ab700676e1ba644a5caf99d90ea 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -102,6 +102,7 @@ define :rails_port, :action => [ :create, :enable ] do
     cwd rails_directory
     user "root"
     group "root"
+    environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     if run_migrations
       notifies :run, "execute[#{rails_directory}/db/migrate]"
     else
@@ -202,6 +203,10 @@ define :rails_port, :action => [ :create, :enable ] do
       line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{params[:oauth_key]}\"")
     end
 
+    if params[:nominatim_url]
+      line.gsub!(/^( *)nominatim_url:.*$/, "\\1nominatim_url: \"#{params[:nominatim_url]}\"")
+    end
+
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")