diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
commit | 151e42654a4bcfcff408c7799db199c71e81b5c5 (patch) | |
tree | 02786db1039902c7cc75f76aa7159829299970ac /install | |
parent | 661218e0acd24fc3bca76229b61d0cb91a54be1c (diff) | |
parent | 5eb8667794636e379a8c324da46c617ad365747a (diff) | |
download | Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.tar.bz2 Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.zip |
Merge branch 'master' into v0.9
Diffstat (limited to 'install')
-rw-r--r-- | install/nginx.conf.template | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/install/nginx.conf.template b/install/nginx.conf.template index 8df09e859..673135c0e 100644 --- a/install/nginx.conf.template +++ b/install/nginx.conf.template @@ -29,6 +29,8 @@ server { location / { include uwsgi_params; uwsgi_pass 127.0.0.1:#UWSGI_PORT#; + uwsgi_read_timeout 1800; + uwsgi_send_timeout 600; } } |