Skip to content
Browse files

Forgot to update the passenger_apache_module method.

  • Loading branch information...
1 parent d8d1b3e commit 2962868e1ea551897189235ca65bc53d72918f34 @kplawver kplawver committed Mar 7, 2013
Showing with 4 additions and 10 deletions.
  1. +4 −10 lib/moonshine/manifest/rails/passenger.rb
View
14 lib/moonshine/manifest/rails/passenger.rb
@@ -56,19 +56,13 @@ def passenger_apache_module
file("/usr/local/src")
]
- lib_dir = "ext"
-
- if passenger_major_version >= 3 && passenger_minor_version >= 9
- lib_dir = "libout"
- end
-
# Build Passenger from source
exec "build_passenger",
:cwd => configuration[:passenger][:path],
:command => 'sudo /usr/bin/ruby -S rake clean apache2',
:unless => [
- "ls `passenger-config --root`/#{lib_dir}/apache2/mod_passenger.so",
- "ls `passenger-config --root`/#{lib_dir}/ruby/ruby-*/passenger_native_support.so",
+ "ls `passenger-config --root`/#{passenger_lib_dir}/apache2/mod_passenger.so",
+ "ls `passenger-config --root`/#{passenger_lib_dir}/ruby/ruby-*/passenger_native_support.so",
"ls `passenger-config --root`/agents/PassengerLoggingAgent"
].join(" && "),
:require => [
@@ -79,7 +73,7 @@ def passenger_apache_module
],
:timeout => 108000
- load_template = "LoadModule passenger_module #{configuration[:passenger][:path]}/#{lib_dir}/apache2/mod_passenger.so"
+ load_template = "LoadModule passenger_module #{configuration[:passenger][:path]}/#{passenger_lib_dir}/apache2/mod_passenger.so"
file '/etc/apache2/mods-available/passenger.load',
:ensure => :present,
@@ -99,7 +93,7 @@ def passenger_apache_module
a2enmod 'passenger', :require => [exec("build_passenger"), file("passenger_conf"), file("passenger_load"), exec('a2enmod headers')]
end
-
+
# Creates and enables a vhost configuration named after your application.
# Also ensures that the <tt>000-default</tt> vhost is disabled.
def passenger_site

0 comments on commit 2962868

Please sign in to comment.
Something went wrong with that request. Please try again.