summaryrefslogtreecommitdiff
path: root/www/nginx-devel/patches/patch-aa
blob: b19839affcc9174b9bbd23a9e8300888a23463f7 (plain)
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
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
$NetBSD: patch-aa,v 1.1 2013/02/22 17:06:54 imil Exp $

This patch provides config file adapted to pkgsrc settings.

--- conf/nginx.conf.orig	2011-06-27 15:47:51.000000000 +0000
+++ conf/nginx.conf
@@ -1,28 +1,29 @@
 
-#user  nobody;
+user   %%NGINX_USER%%  %%NGINX_GROUP%%;
 worker_processes  1;
 
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
+#error_log  %%NGINX_LOGDIR%%/error.log;                                                                                                                                                                           
+#error_log  %%NGINX_LOGDIR%%/error.log  notice;                                                                                                                                                                   
+#error_log  %%NGINX_LOGDIR%%/error.log  info;
 
+#pid        %%NGINX_PIDDIR%%/nginx.pid;
 
 events {
+    # After increasing this value You probably should increase limit
+    # of file descriptors (for example in start_precmd in startup script)
     worker_connections  1024;
 }
 
 
 http {
-    include       mime.types;
+    include       %%PKG_SYSCONFDIR%%/mime.types;
     default_type  application/octet-stream;
 
     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
     #                  '$status $body_bytes_sent "$http_referer" '
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
-    #access_log  logs/access.log  main;
+    #access_log  %%NGINX_LOGDIR%%/access.log  main;
 
     sendfile        on;
     #tcp_nopush     on;
@@ -38,10 +39,10 @@ http {
 
         #charset koi8-r;
 
-        #access_log  logs/host.access.log  main;
+        #access_log  %%NGINX_LOGDIR%%/host.access.log  main;
 
         location / {
-            root   html;
+            root   share/examples/nginx/html;
             index  index.html index.htm;
         }
 
@@ -51,7 +52,7 @@ http {
         #
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
-            root   html;
+            root   share/examples/nginx/html;
         }
 
         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
@@ -67,7 +68,7 @@ http {
         #    fastcgi_pass   127.0.0.1:9000;
         #    fastcgi_index  index.php;
         #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-        #    include        fastcgi_params;
+        #    include        %%PKG_SYSCONFDIR%%/fastcgi_params;
         #}
 
         # deny access to .htaccess files, if Apache's document root
@@ -87,7 +88,7 @@ http {
     #    server_name  somename  alias  another.alias;
 
     #    location / {
-    #        root   html;
+    #        root   share/examples/nginx/html;
     #        index  index.html index.htm;
     #    }
     #}
@@ -110,7 +111,7 @@ http {
     #    ssl_prefer_server_ciphers   on;
 
     #    location / {
-    #        root   html;
+    #        root   share/examples/nginx/html;
     #        index  index.html index.htm;
     #    }
     #}