Ema has submitted this change and it was merged.
Change subject: Simplify VCL errorpage
......................................................................
Simplify VCL errorpage
We are currently returning redundant information such as the server port
and IP which we can already figure out from server.hostname and
server.identity. Further, X-Client-IP is more reliable than client.ip,
and X-Forwarded-For is not particularly interesting.
Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Ema: Verified; Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/templates/varnish/errorpage.inc.vcl.erb
b/templates/varnish/errorpage.inc.vcl.erb
index 92264b6..6966315 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -26,8 +26,8 @@
<div class="footer">
<p>If you report this error to the Wikimedia System Administrators, please
include the details below.</p>
<p class="text-muted"><code>
-Request from "} + client.ip + " via " + server.hostname + " " +
server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " +
req.xid + "<br>" +
-regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0<br>") +
regsub(obj.http.X-Cache, ".+", "Upstream caches: \0<br>") +
+Request from "} + req.http.X-Client-IP + " via " + server.hostname + " " +
server.identity + ", Varnish XID " + req.xid + "<br>" +
+regsub(obj.http.X-Cache, ".+", "Upstream caches: \0<br>") +
"Error: " + obj.status + ", " + obj.response + " at " + now +
{"
</code></p></div></html>
--
To view, visit https://gerrit.wikimedia.org/r/273480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
