Reorder find arguments to avoid warning

[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..6abec935710c6078d6bf99f4a938f52444d44cbb 100644 (file)
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -46,6 +46,7 @@ define :rails_port, :action => [ :create, :enable ] do
   package "nodejs"
 
   package "g++"
   package "nodejs"
 
   package "g++"

+  package "pkg-config"

   package "libpq-dev"
   package "libsasl2-dev"
   package "libxml2-dev"
   package "libpq-dev"
   package "libsasl2-dev"
   package "libxml2-dev"


@@ -102,6 +103,7 @@ define :rails_port, :action => [ :create, :enable ] do
     cwd rails_directory
     user "root"
     group "root"
     cwd rails_directory
     user "root"
     group "root"

+    environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"

     if run_migrations
       notifies :run, "execute[#{rails_directory}/db/migrate]"
     else
     if run_migrations
       notifies :run, "execute[#{rails_directory}/db/migrate]"
     else


@@ -202,6 +204,10 @@ define :rails_port, :action => [ :create, :enable ] do
       line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{params[:oauth_key]}\"")
     end
 
       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")
 
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")