[MediaWiki-commits] [Gerrit] Mobile redirects for non-canonical article URLs - change (operations/puppet)

2015-06-19 Thread BBlack (Code Review) 
BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/219471

Change subject: Mobile redirects for non-canonical article URLs
..

Mobile redirects for non-canonical article URLs

We don't yet know why Google is starting to return /?title= links,
but apparently it's hurting mobile redirects, so this is a quick
fix for that:

https://en.wikipedia.org/wiki/Wikipedia:Village_pump_(technical)#Wikipedia_on_a_mobile_browser_is_not_showing_the_mobile_version_of_the_page

Change-Id: I32fda7703b510b3f5531e948e8343106c220571e
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/219471/1

diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index ad73aa9..164aede 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -45,7 +45,11 @@
 (req.http.User-Agent ~ 
(?i)(mobi|240x240|240x320|320x320|alcatel|android|audiovox|bada|benq|blackberry|cdm-|compal-|docomo|ericsson|hiptop|htc[-_]|huawei|ipod|kddi-|kindle|meego|midp|mitsu|mmp\/|mot-|motor|ngm_|nintendo|opera.m|palm|panasonic|philips|phone|playstation|portalmmm|sagem-|samsung|sanyo|sec-|semc-browser|sendo|sharp|silk|softbank|symbian|teleca|up.browser|vodafone|webos)
|| req.http.User-Agent ~ ^(?i)(lge?|sie|nec|sgh|pg)- 
|| req.http.Accept ~ vnd.wap.wml)
 req.http.Cookie !~ 
(stopMobileRedirect=true|mf_useformat=desktop)
-req.url ~ 
^/(wiki|(gan|ike|iu|kk|ku|shi|sr|tg|uz|zh)(-[a-z]+)?)[/\?]) {
+(
+   req.url ~ 
^/(wiki|(gan|ike|iu|kk|ku|shi|sr|tg|uz|zh)(-[a-z]+)?)[/\?]
+   || req.url ~ ^/w/index\.php
+   || req.url ~ ^/\?title=
+   ) {
 
// Separate regexps for clarity, but multiple regsubs instead of
// if host ~/regsub matches for efficiency. Be careful to not

-- 
To view, visit https://gerrit.wikimedia.org/r/219471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32fda7703b510b3f5531e948e8343106c220571e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Mobile redirects for non-canonical article URLs - change (operations/puppet)

2015-06-19 Thread BBlack (Code Review) 
BBlack has submitted this change and it was merged.

Change subject: Mobile redirects for non-canonical article URLs
..


Mobile redirects for non-canonical article URLs

We don't yet know why Google is starting to return /?title= links,
but apparently it's hurting mobile redirects, so this is a quick
fix for that.

Bug: T103158
Change-Id: I32fda7703b510b3f5531e948e8343106c220571e
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  MaxSem: Looks good to me, but someone else must approve
  BBlack: 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 ad73aa9..164aede 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -45,7 +45,11 @@
 (req.http.User-Agent ~ 
(?i)(mobi|240x240|240x320|320x320|alcatel|android|audiovox|bada|benq|blackberry|cdm-|compal-|docomo|ericsson|hiptop|htc[-_]|huawei|ipod|kddi-|kindle|meego|midp|mitsu|mmp\/|mot-|motor|ngm_|nintendo|opera.m|palm|panasonic|philips|phone|playstation|portalmmm|sagem-|samsung|sanyo|sec-|semc-browser|sendo|sharp|silk|softbank|symbian|teleca|up.browser|vodafone|webos)
|| req.http.User-Agent ~ ^(?i)(lge?|sie|nec|sgh|pg)- 
|| req.http.Accept ~ vnd.wap.wml)
 req.http.Cookie !~ 
(stopMobileRedirect=true|mf_useformat=desktop)
-req.url ~ 
^/(wiki|(gan|ike|iu|kk|ku|shi|sr|tg|uz|zh)(-[a-z]+)?)[/\?]) {
+(
+   req.url ~ 
^/(wiki|(gan|ike|iu|kk|ku|shi|sr|tg|uz|zh)(-[a-z]+)?)[/\?]
+   || req.url ~ ^/w/index\.php
+   || req.url ~ ^/\?title=
+   ) {
 
// Separate regexps for clarity, but multiple regsubs instead of
// if host ~/regsub matches for efficiency. Be careful to not

-- 
To view, visit https://gerrit.wikimedia.org/r/219471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I32fda7703b510b3f5531e948e8343106c220571e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits