Set action to "nothing" explicitly when using passenger_application

Apparently have "nothing" as the default action for a custom resource
doesn't actually work, even if you define it explicitly.

diff --git a/cookbooks/passenger/resources/application.rb b/cookbooks/passenger/resources/application.rb
index 1beb4bd3e2efb84bab148f7abcc2aba4b082bf49..ce0c0dc2f9aa8ff15dab3ace3e49a06d07de761a 100644 (file)
--- a/cookbooks/passenger/resources/application.rb
+++ b/cookbooks/passenger/resources/application.rb
@@ -17,13 +17,10 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-default_action :nothing
+default_action :restart

 
 property :application, String, :name_attribute => true
 
 
 property :application, String, :name_attribute => true
 

-action :nothing do
-end
-

 action :restart do
   execute new_resource.application do
     action :run
 action :restart do
   execute new_resource.application do
     action :run

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 19c467c82cc2ccd2b79f750d45793fa6e4f89a72..d55add7559ab5254b31ad8474343bf0c6efc8e1b 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -172,7 +172,9 @@ node[:taginfo][:sites].each do |site|
     variables :name => site_name, :directory => directory
   end
 
     variables :name => site_name, :directory => directory
   end
 

-  passenger_application "#{directory}/taginfo/web/public"
+  passenger_application "#{directory}/taginfo/web/public" do
+    action :nothing
+  end

 
   ssl_certificate site_name do
     domains [site_name] + site_aliases
 
   ssl_certificate site_name do
     domains [site_name] + site_aliases

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 067c1334c2ef6a01dede62dd9e7db1bf4297022f..913f0a17f93c91d6495102e0778479abf265a4c8 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -346,6 +346,7 @@ action :create do
   end
 
   passenger_application rails_directory do
   end
 
   passenger_application rails_directory do

+    action :nothing

     only_if { ::File.exist?("/usr/bin/passenger-config") }
   end
 
     only_if { ::File.exist?("/usr/bin/passenger-config") }
   end