Faidon Liambotis has submitted this change and it was merged.
Change subject: protoproxy: set proxy_read_timeout to 180s
......................................................................
protoproxy: set proxy_read_timeout to 180s
As a follow up to Ic14902d399712a1eb0d2d98ce5f505e6740ef68b, also set
protoproxy's proxy_read_timeout to be in sync with Varnish's
first_byte_timeout and PHP's max_execution_time.
Change-Id: I605ab157a3723da5663bb8fa978f16a42d67d4f1
---
M modules/protoproxy/templates/localssl.erb
M modules/protoproxy/templates/proxy.erb
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/protoproxy/templates/localssl.erb
b/modules/protoproxy/templates/localssl.erb
index 59ff3e1..7c57034 100644
--- a/modules/protoproxy/templates/localssl.erb
+++ b/modules/protoproxy/templates/localssl.erb
@@ -18,6 +18,10 @@
location / {
proxy_pass http://<%= scope.lookupvar('::ipaddress') %>:<%=
@upstream_port %>;
+ # this should be in sync with Varnish's first_byte_timeout
+ # and PHP's max_execution_time
+ proxy_read_timeout 180s;
+
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/modules/protoproxy/templates/proxy.erb
b/modules/protoproxy/templates/proxy.erb
index 6412628..9319433 100644
--- a/modules/protoproxy/templates/proxy.erb
+++ b/modules/protoproxy/templates/proxy.erb
@@ -64,6 +64,10 @@
error_page 502 503 504 = @fallback;
<% end -%>
+ # this should be in sync with Varnish's first_byte_timeout
+ # and PHP's max_execution_time
+ proxy_read_timeout 180s;
+
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
--
To view, visit https://gerrit.wikimedia.org/r/98761
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I605ab157a3723da5663bb8fa978f16a42d67d4f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
