File nginx-1.0.4_default_config.patch of Package nginx-1.2

File nginx-1.0.4_default_config.patch of Package nginx-1.2 (Revision 5a0adcc8b1bcfdbf732255906ff77b6a)

Currently displaying revision 5a0adcc8b1bcfdbf732255906ff77b6a, show latest

Index: conf/nginx.conf
===================================================================
--- conf/nginx.conf.orig
+++ conf/nginx.conf
@@ -1,16 +1,17 @@
 
-#user  nobody;
+#user  nginx;
 worker_processes  1;
 
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
+#error_log  /var/log/nginx/error.log;
+#error_log  /var/log/nginx/error.log  notice;
+#error_log  /var/log/nginx/error.log  info;
 
-#pid        logs/nginx.pid;
+#pid        /var/run/nginx.pid;
 
 
 events {
     worker_connections  1024;
+    use epoll;
 }
 
 
@@ -22,7 +23,7 @@ http {
     #                  '$status $body_bytes_sent "$http_referer" '
     #                  '"$http_user_agent" "$http_x_forwarded_for"';
 
-    #access_log  logs/access.log  main;
+    #access_log  /var/log/nginx/access.log  main;
 
     sendfile        on;
     #tcp_nopush     on;
@@ -32,16 +33,18 @@ http {
 
     #gzip  on;
 
+    include conf.d/*.conf;
+
     server {
         listen       80;
         server_name  localhost;
 
         #charset koi8-r;
 
-        #access_log  logs/host.access.log  main;
+        #access_log  /var/log/nginx/host.access.log  main;
 
         location / {
-            root   html;
+            root   /srv/www/htdocs/;
             index  index.html index.htm;
         }
 
@@ -51,7 +54,7 @@ http {
         #
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {
-            root   html;
+            root   /srv/www/htdocs/;
         }
 
         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
@@ -87,7 +90,7 @@ http {
     #    server_name  somename  alias  another.alias;
 
     #    location / {
-    #        root   html;
+    #        root   /srv/www/htdocs/;
     #        index  index.html index.htm;
     #    }
     #}
@@ -110,9 +113,10 @@ http {
     #    ssl_prefer_server_ciphers   on;
 
     #    location / {
-    #        root   html;
+    #        root   /srv/www/htdocs/;
     #        index  index.html index.htm;
     #    }
     #}
 
+    include vhosts.d/*.conf;
 }