Mark Bergsma has submitted this change and it was merged.
Change subject: Move vcl_deliver after vcl_error (more consistent)
......................................................................
Move vcl_deliver after vcl_error (more consistent)
Change-Id: I4e396c45c139983ac3d9ec39716a1bbfefb95b70
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 675ffb4..b246bf1 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -71,16 +71,6 @@
return (deliver);
}
-sub vcl_deliver {
- /* Override the Cache-Control header for wiki content pages */
- if (req.url ~ "(?i)^/w(iki)?/.*"
- && req.url !~ "^/wiki/Special\:Banner(Controller|ListLoader)"
- && req.url !~ "(?i)^/w/(extensions/.*|api\.php)"
- && req.url !~ "(?i)bcache=1") {
- set resp.http.Cache-Control = "private, s-maxage=0, max-age=0,
must-revalidate";
- }
-}
-
sub vcl_error {
/* Support mobile redirects */
if (obj.status == 666) {
@@ -93,3 +83,13 @@
call errorpage;
return(deliver);
}
+
+sub vcl_deliver {
+ /* Override the Cache-Control header for wiki content pages */
+ if (req.url ~ "(?i)^/w(iki)?/.*"
+ && req.url !~ "^/wiki/Special\:Banner(Controller|ListLoader)"
+ && req.url !~ "(?i)^/w/(extensions/.*|api\.php)"
+ && req.url !~ "(?i)bcache=1") {
+ set resp.http.Cache-Control = "private, s-maxage=0, max-age=0,
must-revalidate";
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/75644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e396c45c139983ac3d9ec39716a1bbfefb95b70
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
