Logoj0ke.net Open Build Service > Projects > home:kries:proceed_test > nginx > nginx-conf-0.7.x.patch
Sign Up | Log In

File nginx-conf-0.7.x.patch of Package nginx (Revision 7cddfe142d205046f4ba48079cef4973)

Currently displaying revision 7cddfe142d205046f4ba48079cef4973, show latest

x
 
1
Index: conf/nginx.conf
2
===================================================================
3
--- conf/nginx.conf.orig    2009-04-06 15:43:46.000000000 +0200
4
+++ conf/nginx.conf 2009-06-25 12:38:03.000000000 +0200
5
@@ -1,28 +1,57 @@
6
+#######################################################################
7
+#
8
+# This is the main Nginx configuration file.  
9
+#
10
+# More information about the configuration options is available on 
11
+#   * the English wiki - http://wiki.codemongers.com/Main
12
+#   * the Russian documentation - http://sysoev.ru/nginx/
13
+#
14
+#######################################################################
15
+
16
+#----------------------------------------------------------------------
17
+# Main Module - directives that cover basic functionality
18
+#
19
+#   http://wiki.codemongers.com/NginxMainModule
20
+#
21
+#----------------------------------------------------------------------
22
 
23
-#user  nobody;
24
+user              nginx;
25
 worker_processes  1;
26
 
27
-#error_log  logs/error.log;
28
-#error_log  logs/error.log  notice;
29
-#error_log  logs/error.log  info;
30
+error_log         /var/log/nginx/error.log;
31
+#error_log        /var/log/nginx/error.log  notice;
32
+#error_log        /var/log/nginx/error.log  info;
33
+ 
34
+pid               /var/run/nginx.pid;
35
 
36
-#pid        logs/nginx.pid;
37
 
38
+#----------------------------------------------------------------------
39
+# Events Module 
40
+#
41
+#   http://wiki.codemongers.com/NginxEventsModule
42
+#
43
+#----------------------------------------------------------------------
44
 
45
 events {
46
     worker_connections  1024;
47
 }
48
 
49
+#----------------------------------------------------------------------
50
+# HTTP Core Module
51
+#
52
+#   http://wiki.codemongers.com/NginxHttpCoreModule 
53
+#
54
+#----------------------------------------------------------------------
55
 
56
 http {
57
-    include       mime.types;
58
+    include       /etc/nginx/mime.types;
59
     default_type  application/octet-stream;
60
 
61
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
62
-    #                  '$status $body_bytes_sent "$http_referer" '
63
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
64
+    log_format  main  '$remote_addr - $remote_user [$time_local] $request '
65
+                      '"$status" $body_bytes_sent "$http_referer" '
66
+                      '"$http_user_agent" "$http_x_forwarded_for"';
67
 
68
-    #access_log  logs/access.log  main;
69
+    access_log  /var/log/nginx/access.log  main;
70
 
71
     sendfile        on;
72
     #tcp_nopush     on;
73
@@ -32,9 +61,18 @@ http {
74
 
75
     #gzip  on;
76
 
77
+    
78
+    # Load config files from the /etc/nginx/conf.d directory
79
+    include /etc/nginx/conf.d/*.conf;
80
+
81
+
82
+    #
83
+    # The default server
84
+    #
85
+
86
     server {
87
         listen       80;
88
-        server_name  localhost;
89
+        server_name  _;
90
 
91
         #charset koi8-r;
92
 
93
@@ -42,16 +80,17 @@ http {
94
 
95
         location / {
96
             root   html;
97
-            index  index.html index.htm;
98
+            root   /usr/share/nginx/html;
99
+             index  index.html index.htm;
100
         }
101
 
102
-        #error_page  404              /404.html;
103
+        error_page  404              /404.html;
104
 
105
         # redirect server error pages to the static page /50x.html
106
         #
107
         error_page   500 502 503 504  /50x.html;
108
         location = /50x.html {
109
-            root   html;
110
+            root   /usr/share/nginx/html;
111
         }
112
 
113
         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
114