summaryrefslogtreecommitdiff
path: root/nginx.conf
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-13 12:13:23 +0100
committerrautenberg <rautenberg@in-silico.ch>2012-03-13 12:13:23 +0100
commit65b517dd4494d730bf5602bd070a59d0044efe5b (patch)
tree7443c67b2813a9f04483ba8c59f0fd8c2a798923 /nginx.conf
parentfe3e3f88762df7cc57df76fe4d2a10602a3daa73 (diff)
parent803ae809cc5092e082ee527dac6eb25c1a63dcf3 (diff)
Merge branch 'release/v3.1.0'v3.1.0
Diffstat (limited to 'nginx.conf')
-rw-r--r--nginx.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/nginx.conf b/nginx.conf
index c89efe2..c15dc02 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -14,6 +14,7 @@ http {
passenger_log_level 2;
passenger_spawn_method conservative;
#passenger_use_global_queue on;
+ passenger_max_pool_size 30;
include NGINX_DEST/conf/mime.types;
default_type application/octet-stream;
@@ -23,7 +24,7 @@ http {
# webservices
server {
- listen 80;
+ listen NGINX_PORT;
client_max_body_size 5000m;
server_name SERVERNAME;
location / {