[packages/nginx] Make the default configs work
jajcus
jajcus at pld-linux.org
Fri Apr 10 18:21:10 CEST 2015
commit 7e1064c967dd9e84d8adf28e3238204a2ba598bb
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Apr 10 18:20:06 2015 +0200
Make the default configs work
Also: remove unnecessary directives. They are probably obsolete anyway,
any built-ins should be reasonable and better updated than what we had.
nginx-light.conf | 38 --------------------------------------
nginx-mail.conf | 1 -
nginx-perl.conf | 36 +++++-------------------------------
nginx-standard.conf | 42 ------------------------------------------
4 files changed, 5 insertions(+), 112 deletions(-)
---
diff --git a/nginx-light.conf b/nginx-light.conf
index 2a4d20f..0e7b23f 100644
--- a/nginx-light.conf
+++ b/nginx-light.conf
@@ -1,5 +1,4 @@
user nginx nginx;
-worker_processes 5;
error_log /var/log/nginx/nginx-light_error.log;
pid /var/run/nginx-light.pid;
@@ -16,56 +15,19 @@ http {
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/nginx-light_access.log main;
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- server_names_hash_bucket_size 128;
- types_hash_max_size 2048;
- types_hash_bucket_size 64;
- #keepalive_timeout 0;
- keepalive_timeout 65;
- limit_zone test-limit $binary_remote_addr 10m;
- #gzip on;
server {
listen 80;
server_name localhost;
access_log /var/log/nginx/nginx-light_access.log main;
- client_max_body_size 10M;
location / {
autoindex on;
root /home/services/nginx/html;
index index.html index.htm index.php;
- limit_conn test-limit 15;
}
include webapps.d/*.conf;
-
-
-# location /nginx_status {
-# stub_status on;
-# access_log off;
-# allow 127.0.0.1;
-# deny all;
-# }
-
-# error_page 404 /404.html;
-# error_page 500 502 503 504 /50x.html;
-# location = /50x.html {
-# root /home/services/http/error-pages;
-# }
-# location = /404.html {
-# root /home/services/http/error-pages;
-# }
-
-# location ~ \.php$ {
-# include /etc/nginx/fastcgi.params;
-# fastcgi_pass 127.0.0.1:1026;
-# fastcgi_index index.php;
-# fastcgi_param SCRIPT_FILENAME /home/services/nginx/html$fastcgi_script_name;
-# }
-
}
include vhosts.d/*.conf;
diff --git a/nginx-mail.conf b/nginx-mail.conf
index 90a8642..9dbfd7a 100644
--- a/nginx-mail.conf
+++ b/nginx-mail.conf
@@ -1,5 +1,4 @@
user nginx nginx;
-worker_processes 5;
error_log /var/log/nginx/nginx-mail_error.log;
pid /var/run/nginx-mail.pid;
diff --git a/nginx-perl.conf b/nginx-perl.conf
index be689a3..311b2b1 100644
--- a/nginx-perl.conf
+++ b/nginx-perl.conf
@@ -1,5 +1,4 @@
user nginx nginx;
-worker_processes 5;
error_log /var/log/nginx/nginx-perl_error.log;
pid /var/run/nginx-perl.pid;
@@ -16,16 +15,6 @@ http {
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/nginx-perl_access.log main;
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- server_names_hash_bucket_size 128;
- types_hash_max_size 2048;
- types_hash_bucket_size 64;
- #keepalive_timeout 0;
- keepalive_timeout 65;
- limit_zone test-limit $binary_remote_addr 10m;
- #gzip on;
# perl_modules perl/lib;
# perl_require /home/services/nginx/cgi-bin/example-hello-01.pm;
@@ -47,11 +36,13 @@ http {
listen 80;
server_name localhost;
access_log /var/log/nginx/nginx-perl_access.log main;
- client_max_body_size 10M;
location / {
- perl example-hello-01::handler;
- limit_conn test-limit 15;
+ #perl example-hello-01::handler;
+
+ autoindex on;
+ root /home/services/nginx/html;
+ index index.html index.htm index.php;
}
@@ -79,23 +70,6 @@ http {
}
include webapps.d/*.conf;
-
-# location /nginx_status {
-# stub_status on;
-# access_log off;
-# allow 127.0.0.1;
-# deny all;
-# }
-
-# error_page 404 /404.html;
-# error_page 500 502 503 504 /50x.html;
-# location = /50x.html {
-# root /home/services/http/error-pages;
-# }
-# location = /404.html {
-# root /home/services/http/error-pages;
-# }
-
}
include vhosts.d/*.conf;
diff --git a/nginx-standard.conf b/nginx-standard.conf
index b265718..50125d3 100644
--- a/nginx-standard.conf
+++ b/nginx-standard.conf
@@ -1,5 +1,4 @@
user nginx nginx;
-worker_processes 5;
error_log /var/log/nginx/nginx-standard_error.log;
pid /var/run/nginx-standard.pid;
@@ -16,24 +15,9 @@ http {
'"$status" $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/nginx-standard_access.log main;
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- server_names_hash_bucket_size 128;
- types_hash_max_size 2048;
- types_hash_bucket_size 64;
- #keepalive_timeout 0;
- keepalive_timeout 65;
- limit_zone test-limit $binary_remote_addr 10m;
- #gzip on;
- #gzip_http_version 1.0;
- #gzip_comp_level 2;
- #gzip_proxied any;
- #gzip_types text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
server {
listen 80;
-
# listen 443 ssl;
# Leave only secure protocols (so disable unsecure SSLv2/SSLv3)
@@ -53,40 +37,14 @@ http {
server_name localhost;
access_log /var/log/nginx/nginx-standard_access.log main;
- client_max_body_size 10M;
location / {
autoindex on;
root /home/services/nginx/html;
index index.html index.htm index.php;
- limit_conn test-limit 15;
}
include webapps.d/*.conf;
-
-# location /nginx_status {
-# stub_status on;
-# access_log off;
-# allow 127.0.0.1;
-# deny all;
-# }
-
-# error_page 404 /404.html;
-# error_page 500 502 503 504 /50x.html;
-# location = /50x.html {
-# root /home/services/http/error-pages;
-# }
-# location = /404.html {
-# root /home/services/http/error-pages;
-# }
-
-# location ~ \.php$ {
-# include /etc/nginx/fastcgi.params;
-# fastcgi_pass 127.0.0.1:1026;
-# fastcgi_index index.php;
-# fastcgi_param SCRIPT_FILENAME /home/services/nginx/html$fastcgi_script_name;
-# }
-
}
include vhosts.d/*.conf;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/7e1064c967dd9e84d8adf28e3238204a2ba598bb
More information about the pld-cvs-commit
mailing list