From 06cfaeb8a17b7172ff91ca1aeccf96aa6bae120f Mon Sep 17 00:00:00 2001 From: Valery Kholodkov Date: Sun, 20 Jul 2008 08:37:48 +0000 Subject: [PATCH] Removed unnecessary configuration --- nginx.conf | 102 +---------------------------------------------------- 1 file changed, 1 insertion(+), 101 deletions(-) diff --git a/nginx.conf b/nginx.conf index 1db463e..2179ef8 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,14 +1,7 @@ -#user nobody; -daemon off; worker_processes 20; -master_process off; -#error_log logs/error.log; -#error_log logs/error.log notice; -error_log logs/error.log debug; - -#pid logs/nginx.pid; +error_log logs/error.log notice; user root nobody; working_directory /usr/local/nginx; @@ -21,34 +14,11 @@ http { include 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; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - server { client_max_body_size 100m; listen 80; server_name localhost; - #charset koi8-r; - - #access_log logs/host.access.log main; - - location / { - root html; - index index.html index.htm; - } - location /upload { upload_pass /test; upload_store /tmp; @@ -57,75 +27,5 @@ http { location /test { proxy_pass http://localhost:8080; } - - #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; - # } - #} - }