Skip to content

Commit

Permalink
Feature: Can now specify pool idle time and max instances for passenger
Browse files Browse the repository at this point in the history
  • Loading branch information
Theo Cushion committed Oct 28, 2009
1 parent 7f5e5fe commit 6b77c39
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions apache2/recipes/mod_rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# limitations under the License.

include_recipe "passenger"
include_recipe "apache2"

if platform?("centos","redhat") and dist_only?
package "mod_passenger" do
Expand All @@ -49,6 +50,7 @@
owner "root"
group "root"
mode 0755
notifies :restart, resources(:service => "apache2")
end

apache_module "passenger"
10 changes: 5 additions & 5 deletions passenger/attributes/passenger.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
passenger Mash.new unless attribute?("passenger")

passenger[:version] = "2.2.5" unless passenger.has_key?(:version)
passenger[:root_path] = "#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger[:version]}"
passenger[:module_path] = "#{passenger[:root_path]}/ext/apache2/mod_passenger.so"
default[:passenger][:version] = "2.2.5"
default[:passenger][:root_path] = "#{languages[:ruby][:gems_dir]}/gems/passenger-#{passenger[:version]}"
default[:passenger][:module_path] = "#{passenger[:root_path]}/ext/apache2/mod_passenger.so"
default[:passenger][:pool_idle_time] = 0
default[:passenger][:max_instances_per_app] = 4
2 changes: 2 additions & 0 deletions passenger/templates/default/passenger.conf.erb
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
PassengerRoot <%= @node[:passenger][:root_path] %>
PassengerRuby <%= @node[:languages][:ruby][:ruby_bin] %>
PassengerPoolIdleTime <%= @node[:passenger][:pool_idle_time] %>
PassengerMaxInstancesPerApp <%= @node[:passenger][:max_instances_per_app] %>

0 comments on commit 6b77c39

Please sign in to comment.