Search
j0ke.net Open Build Service
>
Projects
>
home:kries
:
proceed_dev
>
nginx_debug
> nginx-conf-0.7.x.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File nginx-conf-0.7.x.patch of Package nginx_debug
Index: conf/nginx.conf =================================================================== --- conf/nginx.conf.orig 2009-04-06 15:43:46.000000000 +0200 +++ conf/nginx.conf 2009-06-25 12:38:03.000000000 +0200 @@ -1,28 +1,57 @@ +####################################################################### +# +# This is the main Nginx configuration file. +# +# More information about the configuration options is available on +# * the English wiki - http://wiki.codemongers.com/Main +# * the Russian documentation - http://sysoev.ru/nginx/ +# +####################################################################### + +#---------------------------------------------------------------------- +# Main Module - directives that cover basic functionality +# +# http://wiki.codemongers.com/NginxMainModule +# +#---------------------------------------------------------------------- -#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 /var/run/nginx.pid; -#pid logs/nginx.pid; +#---------------------------------------------------------------------- +# Events Module +# +# http://wiki.codemongers.com/NginxEventsModule +# +#---------------------------------------------------------------------- events { worker_connections 1024; } +#---------------------------------------------------------------------- +# HTTP Core Module +# +# http://wiki.codemongers.com/NginxHttpCoreModule +# +#---------------------------------------------------------------------- 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"'; + 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 main; sendfile on; #tcp_nopush on; @@ -32,9 +61,18 @@ http { #gzip on; + + # Load config files from the /etc/nginx/conf.d directory + include /etc/nginx/conf.d/*.conf; + + + # + # The default server + # + server { listen 80; - server_name localhost; + server_name _; #charset koi8-r; @@ -42,16 +80,17 @@ http { location / { root html; - index index.html index.htm; + root /usr/share/nginx/html; + index index.html index.htm; } - #error_page 404 /404.html; + 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; + root /usr/share/nginx/html; } # proxy the PHP scripts to Apache listening on 127.0.0.1:80