From 68f75fca170b6736784d654a81366bfac89a140d Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 1 Jul 2013 18:11:49 +1000 Subject: [PATCH 1/3] fixed deprecated version variable missing from pull request 84 --- templates/passenger-apache-centos.conf.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/passenger-apache-centos.conf.erb b/templates/passenger-apache-centos.conf.erb index 26304ab3..704f9fe7 100644 --- a/templates/passenger-apache-centos.conf.erb +++ b/templates/passenger-apache-centos.conf.erb @@ -1,4 +1,4 @@ -<% if version >= '3.9.0' %> +<% if @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,7 +10,7 @@ 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 %> From 643d307608fbe564f15f2a0e0ff7149f1418895f Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Thu, 11 Jul 2013 14:01:39 +1000 Subject: [PATCH 2/3] provide support for passenger >= 4.0.7 --- templates/passenger-apache-centos.conf.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/passenger-apache-centos.conf.erb b/templates/passenger-apache-centos.conf.erb index 704f9fe7..cd09d834 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 From f7fc0c66d49e7ed80e6844659f3c2101e1222684 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 15 Jul 2013 17:01:54 +1000 Subject: [PATCH 3/3] add RackEnv and RailsEnv parameters --- manifests/passenger/apache.pp | 2 ++ templates/passenger-apache-centos.conf.erb | 8 ++++++++ 2 files changed, 10 insertions(+) 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 cd09d834..7a8b8f5a 100644 --- a/templates/passenger-apache-centos.conf.erb +++ b/templates/passenger-apache-centos.conf.erb @@ -16,4 +16,12 @@ LoadModule passenger_module <%= @gempath %>/passenger-<%= @version %>/ext/apache PassengerMinInstances <%= @mininstances %> PassengerSpawnMethod <%= @spawnmethod %> <% end %> + +<% if @rails_env -%> + RailsEnv <%= @rails_env %> +<% end -%> +<% if @rails_env -%> + RackEnv <%= @rack_env %> +<% end -%> +