Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/66079
Change subject: Fix the cluster_tier conditionals ...................................................................... Fix the cluster_tier conditionals Change-Id: I5d426395f608ffd1031d51748ab9d5d5af09378e --- M templates/varnish/text-backend.inc.vcl.erb 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/66079/1 diff --git a/templates/varnish/text-backend.inc.vcl.erb b/templates/varnish/text-backend.inc.vcl.erb index d735a6b..39e9bae 100644 --- a/templates/varnish/text-backend.inc.vcl.erb +++ b/templates/varnish/text-backend.inc.vcl.erb @@ -5,7 +5,7 @@ sub vcl_recv { call vcl_recv_purge; call restrict_access; -<% if cluster_tier == 1 -%> +<% if vcl_config.fetch("cluster_tier", "1") == "1" -%> if ( req.http.host ~ "^test\." ) { set req.backend = test_wikipedia; @@ -20,9 +20,11 @@ } sub vcl_miss { +<% if vcl_config.fetch("cluster_tier", "1") == "1" -%> /* Restore the original Cookie header for MediaWiki */ set req.http.Cookie = req.http.Orig-Cookie; unset req.http.Orig-Cookie; +<% end -%> } sub vcl_error { -- To view, visit https://gerrit.wikimedia.org/r/66079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d426395f608ffd1031d51748ab9d5d5af09378e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits