Faidon has uploaded a new change for review. https://gerrit.wikimedia.org/r/66111
Change subject: Varnish: rename image_scalers to rendering ...................................................................... Varnish: rename image_scalers to rendering Let's be consistent. Change-Id: I0a4c6a7087bde58f2a06783e191993bf2dd7f867 --- M manifests/role/cache.pp M templates/varnish/upload-backend.inc.vcl.erb 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/11/66111/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 66a0a5d..8c9ff20 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -387,13 +387,13 @@ "pmtpa" => { "backend" => $role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary], "api" => $role::cache::configuration::backends[$::realm]['api'][$::mw_primary], - "image_scalers" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], + "rendering" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], "test_wikipedia" => $role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary], }, "eqiad" => { "backend" => $role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary], "api" => $role::cache::configuration::backends[$::realm]['api'][$::mw_primary], - "image_scalers" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], + "rendering" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], "test_wikipedia" => $role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary], }, "esams" => { @@ -551,11 +551,11 @@ $varnish_be_directors = { "pmtpa" => { "backend" => $lvs::configuration::lvs_service_ips[$::realm]['upload']['pmtpa']['uploadsvc'], - "image_scalers" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], + "rendering" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], }, "eqiad" => { "backend" => $lvs::configuration::lvs_service_ips[$::realm]['swift']['pmtpa'], - "image_scalers" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], + "rendering" => $role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary], }, "esams" => { "backend" => $lvs::configuration::lvs_service_ips[$::realm]['upload']['eqiad']['uploadlb'], diff --git a/templates/varnish/upload-backend.inc.vcl.erb b/templates/varnish/upload-backend.inc.vcl.erb index 72b464e..13b8dbc 100644 --- a/templates/varnish/upload-backend.inc.vcl.erb +++ b/templates/varnish/upload-backend.inc.vcl.erb @@ -53,7 +53,7 @@ } } else { - if (req.backend == image_scalers && req.url ~ "^/[^-/]+/[^/]+/thumb/(.+)$") { + if (req.backend == rendering && req.url ~ "^/[^-/]+/[^/]+/thumb/(.+)$") { set bereq.url = regsub(req.url, "^/[^-/]+/[^/]+/thumb/(.+)$", "/w/thumb_handler.php/\1"); set bereq.http.host = regsub(req.url, "^/([^-/]+)/([^/]+)/thumb/.+$", "\2.\1.org"); set bereq.http.X-Original-URI = req.url; @@ -68,7 +68,7 @@ sub check_thumb_404 { if (beresp.status == 404 && bereq.url ~ "^/swift/v1/[^-/]+-[^-/]+-local-thumb") { - set req.backend = image_scalers; + set req.backend = rendering; return (restart); } } -- To view, visit https://gerrit.wikimedia.org/r/66111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a4c6a7087bde58f2a06783e191993bf2dd7f867 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon <fai...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits