rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nginx timeout to match max_execution_time

Browse source
This commit is contained in:
Tom Wiesing 2021-11-17 11:27:19 +01:00
parent 793eab5c2d
commit 32f9876307
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
distillery/resources/compose/web/docker-compose.yml
View file

@ -11,6 +11,7 @@ services:
volumes:
- "vhost:/etc/nginx/vhost.d"
- "./global.conf:/etc/nginx/conf.d/global.conf:ro"
- "./proxy.conf:/etc/nginx/proxy.conf:ro"
- "htpasswd:/etc/nginx/htpasswd"
- "html:/usr/share/nginx/html"
- "/var/run/docker.sock:/tmp/docker.sock:ro"

1
distillery/resources/compose/web/global.conf
View file

@ -2,4 +2,3 @@
# These should match with distillery/resources/compose/barrel/conf/wisski.ini.
client_max_body_size 1000m;
proxy_read_timeout 3000;

19
distillery/resources/compose/web/proxy.conf Normal file
View file

@ -0,0 +1,19 @@
# HTTP 1.1 support
proxy_http_version 1.1;
proxy_buffering off;
proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $proxy_connection;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl;
proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
# Mitigate httpoxy attack (see README for details)
proxy_set_header Proxy "";
# Timeouts for the proxy connection - in sync with the appropriate max_execution time.
proxy_connect_timeout 3000s;
proxy_read_timeout 3000s;
proxy_send_timeout 3000s;