Merge branch 'master' of github.com:railslove/railslove_deploy

railslove · Apr 1, 2010 · d4375b5 · d4375b5
2 parents 961af3b + b7720c9
commit d4375b5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/railslove/sprinkle/passenger.rb b/lib/railslove/sprinkle/passenger.rb
@@ -1,6 +1,6 @@
 package :passenger_gem do 
   description 'Phusion Passenger (aka mod_rails)'
-  version '2.2.10'
+  version '2.2.11'
   gem 'passenger'
   requires :ruby_enterprise
 
@@ -14,7 +14,7 @@
   # require the apache passenger module load/conf files before installation because of a sprinkle limitation.
   requires :apache, :passenger_gem, :passenger_module_load, :passenger_module_conf
 
-  passenger_version = '2.2.10'
+  passenger_version = '2.2.11'
 
   noop do 
     pre :install, 'passenger-install-apache2-module --auto'
@@ -25,7 +25,7 @@
   end
 
   verify do
-    has_file '/usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-2.2.10/ext/apache2/mod_passenger.so'
+    has_file '/usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-2.2.11/ext/apache2/mod_passenger.so'
   end
 end
 
@@ -35,7 +35,7 @@
   requires :apache, :passenger_gem
 
   #TODO: :render => true seems not to work? hello sprinkle?!
-  passenger_version = '2.2.10'
+  passenger_version = '2.2.11'
   transfer "#{File.dirname(__FILE__)}/../templates/passenger.load", "/etc/apache2/mods-available/passenger.load", :render => true
 
   verify do
@@ -49,7 +49,7 @@
   requires :apache, :passenger_gem
 
   #TODO: :render => true seems not to work? hello sprinkle?!  
-  passenger_version = '2.2.10'
+  passenger_version = '2.2.11'
   transfer "#{File.dirname(__FILE__)}/../templates/passenger.conf", "/etc/apache2/mods-available/passenger.conf", :render => true
 
   verify do

diff --git a/lib/railslove/templates/passenger.conf b/lib/railslove/templates/passenger.conf
@@ -1,3 +1,3 @@
-PassengerRoot /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.10" %>
+PassengerRoot /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.11" %>
 PassengerRuby /usr/local/ruby-enterprise/bin/ruby
 RailsEnv production
diff --git a/lib/railslove/templates/passenger.load b/lib/railslove/templates/passenger.load
@@ -1 +1 @@
-LoadModule passenger_module /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.10" %>/ext/apache2/mod_passenger.so
+LoadModule passenger_module /usr/local/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version || "2.2.11" %>/ext/apache2/mod_passenger.so