BBlack has submitted this change and it was merged.
Change subject: cache_maps: varnish4-only
......................................................................
cache_maps: varnish4-only
Change-Id: I9dca4c49192df102b4fe280e9a7bed0b0f1a5a42
---
M templates/varnish/maps-backend.inc.vcl.erb
M templates/varnish/maps-frontend.inc.vcl.erb
2 files changed, 1 insertion(+), 5 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/maps-backend.inc.vcl.erb
b/templates/varnish/maps-backend.inc.vcl.erb
index da7c75f..ed96de9 100644
--- a/templates/varnish/maps-backend.inc.vcl.erb
+++ b/templates/varnish/maps-backend.inc.vcl.erb
@@ -3,11 +3,7 @@
sub cluster_be_recv_pre_purge { }
sub cluster_be_recv_applayer_backend {
-<% if @varnish_version4 -%>
set req.backend_hint = kartotherian.backend();
-<% else -%>
- set req.backend = kartotherian;
-<% end -%>
}
sub cluster_be_recv { }
diff --git a/templates/varnish/maps-frontend.inc.vcl.erb
b/templates/varnish/maps-frontend.inc.vcl.erb
index 5de4a7e..482fb4d 100644
--- a/templates/varnish/maps-frontend.inc.vcl.erb
+++ b/templates/varnish/maps-frontend.inc.vcl.erb
@@ -12,7 +12,7 @@
&& req.http.referer !~
"(?i)^https?://([-a-zA-Z0-9.]+\.)?wmftest\.net(:\d+)?(/|$)"
&& req.http.referer !~
"(?i)^https?://(localhost|127\.0\.0\.1)(:\d+)?(/|$)"
) {
- <%= error_synth(403, "Access Denied") -%>
+ return (synth(403, "Access Denied"));
}
}
--
To view, visit https://gerrit.wikimedia.org/r/286427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9dca4c49192df102b4fe280e9a7bed0b0f1a5a42
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
