X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/628e99e76f4f27bcb06684de9650b55267c95d69..1f960fa38137e62994de9906f855eae3b64a4db6:/cookbooks/web/definitions/rails_port.rb

diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb
index cfa78a275..49d989ff3 100644
--- a/cookbooks/web/definitions/rails_port.rb
+++ b/cookbooks/web/definitions/rails_port.rb
@@ -88,8 +88,8 @@ define :rails_port, :action => [:create, :enable] do
     cwd rails_directory
     user rails_user
     group rails_group
-    notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
-    notifies :run, "execute[#{rails_directory}]"
+    notifies :delete, "file[#{rails_directory}/public/export/embed.html]", :immediate
+    notifies :run, "execute[#{rails_directory}]", :immediate
   end
 
   execute "#{rails_directory}/db/migrate" do
@@ -98,7 +98,7 @@ define :rails_port, :action => [:create, :enable] do
     cwd rails_directory
     user rails_user
     group rails_group
-    notifies :run, "execute[#{rails_directory}/public/assets]"
+    notifies :run, "execute[#{rails_directory}/public/assets]", :immediate
   end
 
   execute "#{rails_directory}/Gemfile" do
@@ -109,9 +109,9 @@ define :rails_port, :action => [:create, :enable] do
     group "root"
     environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
     if run_migrations
-      notifies :run, "execute[#{rails_directory}/db/migrate]"
+      notifies :run, "execute[#{rails_directory}/db/migrate]", :immediate
     else
-      notifies :run, "execute[#{rails_directory}/public/assets]"
+      notifies :run, "execute[#{rails_directory}/public/assets]", :immediate
     end
     subscribes :run, "gem_package[bundler#{ruby_version}]"
   end
@@ -128,7 +128,7 @@ define :rails_port, :action => [:create, :enable] do
     revision rails_revision
     user rails_user
     group rails_group
-    notifies :run, "execute[#{rails_directory}/Gemfile]"
+    notifies :run, "execute[#{rails_directory}/Gemfile]", :immediate
   end
 
   directory "#{rails_directory}/tmp" do
@@ -184,6 +184,10 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#log_path:.*$/, "\\1log_path: \"#{params[:log_path]}\"")
     end
 
+    if params[:logstash_path]
+      line.gsub!(/^( *)#logstash_path:.*$/, "\\1logstash_path: \"#{params[:logstash_path]}\"")
+    end
+
     if params[:memcache_servers]
       line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join("\", \"")}\" ]")
     end
@@ -210,6 +214,16 @@ define :rails_port, :action => [:create, :enable] do
       line.gsub!(/^( *)#google_openid_realm:.*$/, "\\1google_openid_realm: \"#{params[:google_openid_realm]}\"")
     end
 
+    if params[:facebook_auth_id]
+      line.gsub!(/^( *)#facebook_auth_id:.*$/, "\\1facebook_auth_id: \"#{params[:facebook_auth_id]}\"")
+      line.gsub!(/^( *)#facebook_auth_secret:.*$/, "\\1facebook_auth_secret: \"#{params[:facebook_auth_secret]}\"")
+    end
+
+    if params[:windowslive_auth_id]
+      line.gsub!(/^( *)#windowslive_auth_id:.*$/, "\\1windowslive_auth_id: \"#{params[:windowslive_auth_id]}\"")
+      line.gsub!(/^( *)#windowslive_auth_secret:.*$/, "\\1windowslive_auth_secret: \"#{params[:windowslive_auth_secret]}\"")
+    end
+
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
 
@@ -221,7 +235,7 @@ define :rails_port, :action => [:create, :enable] do
     group rails_group
     mode 0664
     content application_yml
-    notifies :run, "execute[#{rails_directory}]"
+    notifies :run, "execute[#{rails_directory}/public/assets]"
   end
 
   if params[:piwik_configuration]