Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65545
Change subject: Varnish: move std.collect X-Varnish/Via to wikimedia
......................................................................
Varnish: move std.collect X-Varnish/Via to wikimedia
Change-Id: I0bf908a94ab226434b6056dcb830d5b86832703c
---
M templates/varnish/upload-frontend.inc.vcl.erb
M templates/varnish/wikimedia.vcl.erb
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/65545/1
diff --git a/templates/varnish/upload-frontend.inc.vcl.erb
b/templates/varnish/upload-frontend.inc.vcl.erb
index 31103a1..ea5687d 100644
--- a/templates/varnish/upload-frontend.inc.vcl.erb
+++ b/templates/varnish/upload-frontend.inc.vcl.erb
@@ -71,10 +71,6 @@
set resp.http.Content-Range = resp.http.X-Content-Range;
remove resp.http.X-Content-Range;
}
-
- /* TODO: Move this to wikimedia.vcl once all instances are >=
3.0.3plus-rc1-wm5 */
- std.collect(resp.http.Via);
- std.collect(resp.http.X-Varnish);
set resp.http.Access-Control-Allow-Origin = "*";
-}
\ No newline at end of file
+}
diff --git a/templates/varnish/wikimedia.vcl.erb
b/templates/varnish/wikimedia.vcl.erb
index 316c278..bdc0f10 100644
--- a/templates/varnish/wikimedia.vcl.erb
+++ b/templates/varnish/wikimedia.vcl.erb
@@ -257,6 +257,9 @@
}
sub vcl_deliver {
+ std.collect(resp.http.Via);
+ std.collect(resp.http.X-Varnish);
+
if (resp.http.X-Cache) {
if (obj.hits > 0) {
set resp.http.X-Cache = resp.http.X-Cache + ", <%=
hostname + (name.empty? ? "" : " " + name) %> hit (" + obj.hits + ")";
--
To view, visit https://gerrit.wikimedia.org/r/65545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bf908a94ab226434b6056dcb830d5b86832703c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
