ports/www/nginx/files/patch-conf-nginx.conf
John Marino ef1a4679e2 www/nginx: Change default log locations to avoid /var/log pollution
The nginx error log default will always be touched regardless of the value
of the error_log directive in nginx.conf.  This is not a bug.  It also
breaks shell tab completion for the sane default of /var/log/nginx.

This change aligns the compiled-in default and the configuration default
of error log to a new default /var/log/nginx directory.

PR:		195916
Approved by:	maintainer timeout (15 months)
2016-09-06 13:57:38 +00:00

47 lines
1.3 KiB
Text

--- conf/nginx.conf.orig 2016-05-31 13:47:01 UTC
+++ conf/nginx.conf
@@ -2,9 +2,14 @@
#user nobody;
worker_processes 1;
-#error_log logs/error.log;
-#error_log logs/error.log notice;
-#error_log logs/error.log info;
+# This default error log path is compiled-in to make sure configuration parsing
+# errors are logged somewhere, especially during unattended boot when stderr
+# isn't normally logged anywhere. This path will be touched on every nginx
+# start regardless of error log location configured here. See
+# https://trac.nginx.org/nginx/ticket/147 for more info.
+#
+#error_log %%NGINX_ERRORLOG%%;
+#
#pid logs/nginx.pid;
@@ -33,7 +38,7 @@ http {
#gzip on;
server {
- listen 80;
+ listen %%HTTP_PORT%%;
server_name localhost;
#charset koi8-r;
@@ -41,7 +46,7 @@ http {
#access_log logs/host.access.log main;
location / {
- root html;
+ root %%PREFIX%%/www/nginx;
index index.html index.htm;
}
@@ -51,7 +56,7 @@ http {
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
- root html;
+ root %%PREFIX%%/www/nginx-dist;
}
# proxy the PHP scripts to Apache listening on 127.0.0.1:80