Avoid using hyphen in mediawiki database name

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

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 17dfe641d3c142f1c8a1aa9868dabccbe24d007c..412d02dae2953ca64e5597e0b9ba1c239a6dd081 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -126,6 +126,7 @@ action :create do
     group new_resource.group
     notifies :run, "execute[#{rails_directory}/Gemfile]"
     notifies :run, "execute[#{rails_directory}/app/assets/javascripts/i18n]"
+    notifies :run, "execute[#{rails_directory}/public/assets]"
     notifies :delete, "file[#{rails_directory}/public/export/embed.html]"
     notifies :restart, "passenger_application[#{rails_directory}]"
   end
@@ -271,6 +272,7 @@ action :create do
 
     line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true")
     line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true")
+    line.gsub!(/^( *)trace_use_job_queue:.*$/, "\\1trace_use_job_queue: false")
 
     line
   end
@@ -345,6 +347,7 @@ action :create do
   end
 
   passenger_application rails_directory do
+    action :nothing
     only_if { ::File.exist?("/usr/bin/passenger-config") }
   end