diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-15 17:16:16 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-15 17:16:16 -0200 |
commit | 07806df3d3257e36013d15825d2237eaec1e7235 (patch) | |
tree | 26d5a39d1c0f8f8238bf8279f1ffbdf293b78df1 /templates/nginx.conf.erb | |
parent | f55b8471ed50cb464a7d33041063e325bc263626 (diff) | |
download | puppet-nginx-07806df3d3257e36013d15825d2237eaec1e7235.tar.gz puppet-nginx-07806df3d3257e36013d15825d2237eaec1e7235.tar.bz2 |
Managing default site and nginx.conf
Diffstat (limited to 'templates/nginx.conf.erb')
-rw-r--r-- | templates/nginx.conf.erb | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/templates/nginx.conf.erb b/templates/nginx.conf.erb index b2be1eb..23077b0 100644 --- a/templates/nginx.conf.erb +++ b/templates/nginx.conf.erb @@ -1,22 +1,20 @@ user www-data; -worker_processes <%= worker_processes %>; +worker_processes 1; -error_log /var/log/nginx/error.log; +#error_log /var/log/nginx/error.log; +error_log /dev/null; pid /var/run/nginx.pid; events { - worker_connections <%= worker_connections %>; + worker_connections 1024; + # multi_accept on; } http { - # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524785 - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=547722 - server_names_hash_bucket_size 100; - include /etc/nginx/mime.types; - default_type application/octet-stream; - access_log /var/log/nginx/access.log; + #access_log /var/log/nginx/access.log; + access_log /dev/null; sendfile on; #tcp_nopush on; @@ -26,7 +24,29 @@ http { tcp_nodelay on; gzip on; + gzip_disable "MSIE [1-6]\.(?!.*SV1)"; include /etc/nginx/conf.d/*.conf; include /etc/nginx/sites-enabled/*; } + +# mail { +# # See sample authentication script at: +# # http://wiki.nginx.org/NginxImapAuthenticateWithApachePhpScript +# +# # auth_http localhost/auth.php; +# # pop3_capabilities "TOP" "USER"; +# # imap_capabilities "IMAP4rev1" "UIDPLUS"; +# +# server { +# listen localhost:110; +# protocol pop3; +# proxy on; +# } +# +# server { +# listen localhost:143; +# protocol imap; +# proxy on; +# } +# } |