aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorHongli Lai (Phusion)2014-01-16 00:11:46 +0100
committerMike McQuaid2014-01-24 19:58:07 +0000
commit610ebccf69565f480446530a016d27dfffbef010 (patch)
treeef5143eedfc014bf32bcd287e1bb5c951c39ac12 /Library
parentb399f016edffb56ecb5420cea9a1793a2e0c1c67 (diff)
downloadhomebrew-610ebccf69565f480446530a016d27dfffbef010.tar.bz2
nginx: use Homebrew passenger.
This time the formula is compatible with Passenger 4.0.33. Closes #26128. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/nginx.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 891ce81d8..0237b4901 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -27,15 +27,14 @@ class Nginx < Formula
skip_clean 'logs'
def passenger_config_args
- nginx_ext = `passenger-config --nginx-addon-dir`.chomp
+ passenger_config = "#{HOMEBREW_PREFIX}/opt/passenger/bin/passenger-config"
+ nginx_ext = `#{passenger_config} --nginx-addon-dir`.chomp
if File.directory?(nginx_ext)
return "--add-module=#{nginx_ext}"
end
- puts "Unable to install nginx with passenger support. The passenger"
- puts "gem must be installed and passenger-config must be in your path"
- puts "in order to continue."
+ puts "Unable to install nginx with passenger support."
exit
end
@@ -130,7 +129,7 @@ class Nginx < Formula
The default port has been set in #{HOMEBREW_PREFIX}/etc/nginx/nginx.conf to 8080 so that
nginx can run without sudo.
EOS
- s << passenger_caveats if build.include? 'with-passenger'
+ s << passenger_caveats if build.with? 'passenger'
s
end