Bug in the nginx-0.7.xx include .../conf.d/*.conf process ?

[Mark Alan]

Merlin wrote:
> The simplest debian-like nginx.conf is something like this:

In Ubuntu/Debian the main differences are:

# debian's web server user (instead of nobody or apache)
-#user  nobody;
+user www-data;

# debian's /etc/logrotate.d/nginx writes to /var/log/nginx/*.log
+error_log  /var/log/nginx/error.log;
+pid  /var/run/nginx.pid;

http {
-    include  mime.types;
+    include  /etc/nginx/mime.types;

-    #access_log  logs/access.log  main;
+    access_log	/var/log/nginx/access.log;

+    tcp_nodelay  on;

+    gzip  on;

+    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/sites-enabled/*;
}

I attach bellow the diff file (made using diff -bru /source... /dest... 
 > nginx.patch).

M.


--
patch follows:


--- /src/nginx-0.7.43/conf/nginx.conf	2008-11-05 13:26:04.000000000 +0000
+++ /src/nginx_0.6.34-2ubuntu1~intrepid1_i386/data/etc/nginx/nginx.conf 
2009-01-28 11:27:29.000000000 +0000
@@ -1,118 +1,28 @@
-
-#user  nobody;
+user www-data;
  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  /var/log/nginx/error.log;
+pid        /var/run/nginx.pid;

  events {
      worker_connections  1024;
  }

-
  http {
-    include       mime.types;
+    include       /etc/nginx/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	/var/log/nginx/access.log;

      sendfile        on;
      #tcp_nopush     on;

      #keepalive_timeout  0;
      keepalive_timeout  65;
+    tcp_nodelay        on;

-    #gzip  on;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        #charset koi8-r;
-
-        #access_log  logs/host.access.log  main;
-
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
-
-        #error_page  404              /404.html;
-
-        # redirect server error pages to the static page /50x.html
-        #
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-
-        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-        #
-        #location ~ \.php$ {
-        #    proxy_pass   http://127.0.0.1;
-        #}
-
-        # pass the PHP scripts to FastCGI server listening on 
127.0.0.1:9000
-        #
-        #location ~ \.php$ {
-        #    root           html;
-        #    fastcgi_pass   127.0.0.1:9000;
-        #    fastcgi_index  index.php;
-        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-        #    include        fastcgi_params;
-        #}
-
-        # deny access to .htaccess files, if Apache's document root
-        # concurs with nginx's one
-        #
-        #location ~ /\.ht {
-        #    deny  all;
-        #}
-    }
-
-
-    # another virtual host using mix of IP-, name-, and port-based 
configuration
-    #
-    #server {
-    #    listen       8000;
-    #    listen       somename:8080;
-    #    server_name  somename  alias  another.alias;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-
-
-    # HTTPS server
-    #
-    #server {
-    #    listen       443;
-    #    server_name  localhost;
-
-    #    ssl                  on;
-    #    ssl_certificate      cert.pem;
-    #    ssl_certificate_key  cert.key;
-
-    #    ssl_session_timeout  5m;
-
-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
-    #    ssl_ciphers 
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
-    #    ssl_prefer_server_ciphers   on;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
+    gzip  on;

+    include /etc/nginx/conf.d/*.conf;
+    include /etc/nginx/sites-enabled/*;
  }