From 9b770a3788f3a507335b761159f1ef0f5709242d Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Mon, 8 Jul 2013 14:46:02 -0700 Subject: [PATCH 1/2] Fix module location in template for Phusion Passenger which changed the module location in Phusion Passenger version 4.0.7. --- templates/passenger-apache-centos.conf.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/passenger-apache-centos.conf.erb b/templates/passenger-apache-centos.conf.erb index 26304ab3..ba28543a 100644 --- a/templates/passenger-apache-centos.conf.erb +++ b/templates/passenger-apache-centos.conf.erb @@ -1,4 +1,7 @@ -<% 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 0245984505b1602e8ad061c5d37cbb523498a7e9 Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Mon, 8 Jul 2013 15:34:33 -0700 Subject: [PATCH 2/2] Fix line split by VI --- templates/passenger-apache-centos.conf.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/passenger-apache-centos.conf.erb b/templates/passenger-apache-centos.conf.erb index ba28543a..327ed452 100644 --- a/templates/passenger-apache-centos.conf.erb +++ b/templates/passenger-apache-centos.conf.erb @@ -1,6 +1,5 @@ <% if version >= '4.0.7' %> -LoadModule passenger_module <%= @gempath %>/passenger-<%= @version %>/buildout/apache2/mod -_passenger.so +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 %>