aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorNick Stenning2012-09-29 13:41:21 +0100
committerAdam Vandenberg2012-09-29 12:45:50 -0700
commit49251567d0afb4613b3dbdb18f83576bb840110c (patch)
tree0962abd4330242e4b7889b1acc25e4c2ca239ce5 /Library/Formula
parent57f2ec657eb2375addb6f43a7d773834d9bab163 (diff)
downloadhomebrew-49251567d0afb4613b3dbdb18f83576bb840110c.tar.bz2
nginx: use #{var}/run for state dirs, not cellar
Closes #15194. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/nginx.rb24
1 files changed, 15 insertions, 9 deletions
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index f710012e9..4fea5a82c 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -25,16 +25,16 @@ class Nginx < Formula
end
def passenger_config_args
- passenger_root = `passenger-config --root`.chomp
+ passenger_root = `passenger-config --root`.chomp
- if File.directory?(passenger_root)
- return "--add-module=#{passenger_root}/ext/nginx"
- end
+ if File.directory?(passenger_root)
+ return "--add-module=#{passenger_root}/ext/nginx"
+ 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."
- exit
+ 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."
+ exit
end
def install
@@ -46,7 +46,12 @@ class Nginx < Formula
"--with-ld-opt=-L#{HOMEBREW_PREFIX}/lib",
"--conf-path=#{etc}/nginx/nginx.conf",
"--pid-path=#{var}/run/nginx.pid",
- "--lock-path=#{var}/nginx/nginx.lock"]
+ "--lock-path=#{var}/run/nginx.lock",
+ "--http-client-body-temp-path=#{var}/run/nginx/client_body_temp",
+ "--http-proxy-temp-path=#{var}/run/nginx/proxy_temp",
+ "--http-fastcgi-temp-path=#{var}/run/nginx/fastcgi_temp",
+ "--http-uwsgi-temp-path=#{var}/run/nginx/uwsgi_temp",
+ "--http-scgi-temp-path=#{var}/run/nginx/scgi_temp"]
args << passenger_config_args if build.include? 'with-passenger'
args << "--with-http_dav_module" if build.include? 'with-webdav'
@@ -55,6 +60,7 @@ class Nginx < Formula
system "make"
system "make install"
man8.install "objs/nginx.8"
+ (var/'run/nginx').mkpath
end
def caveats; <<-EOS.undent