blob: fb38c9c3d9ccc4cd6676bb2c1d374e8a16a285b1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- conf/nginx.conf.orig 2016-09-06 14:56:32 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
|
