diff --git a/manifests/passenger/apache.pp b/manifests/passenger/apache.pp index 7595c8ef..934fc8f2 100644 --- a/manifests/passenger/apache.pp +++ b/manifests/passenger/apache.pp @@ -2,6 +2,8 @@ $ruby_version, $version, $rvm_prefix = '/usr/local/', + $rails_env = undef, + $rack_env = undef, $mininstances = '1', $maxpoolsize = '6', $poolidletime = '300', diff --git a/templates/passenger-apache-centos.conf.erb b/templates/passenger-apache-centos.conf.erb index 26304ab3..7a8b8f5a 100644 --- a/templates/passenger-apache-centos.conf.erb +++ b/templates/passenger-apache-centos.conf.erb @@ -1,4 +1,6 @@ -<% if version >= '3.9.0' %> +<% if @version >= '4.0.7' %> +LoadModule passenger_module <%= @gempath %>/passenger-<%= @version %>/buildout/apache2/mod_passenger.so +<% elsif @version >= '3.9.0' %> LoadModule passenger_module <%= @gempath %>/passenger-<%= @version %>/libout/apache2/mod_passenger.so <% else %> LoadModule passenger_module <%= @gempath %>/passenger-<%= @version %>/ext/apache2/mod_passenger.so @@ -10,8 +12,16 @@ LoadModule passenger_module <%= @gempath %>/passenger-<%= @version %>/ext/apache PassengerMaxPoolSize <%= @maxpoolsize %> PassengerPoolIdleTime <%= @poolidletime %> PassengerMaxInstancesPerApp <%= @maxinstancesperapp %> -<% if version >= '3.0.0' %> +<% if @version >= '3.0.0' %> PassengerMinInstances <%= @mininstances %> PassengerSpawnMethod <%= @spawnmethod %> <% end %> + +<% if @rails_env -%> + RailsEnv <%= @rails_env %> +<% end -%> +<% if @rails_env -%> + RackEnv <%= @rack_env %> +<% end -%> +