Faidon Liambotis has submitted this change and it was merged.
Change subject: Remove temp zone rewrite logic since that zone should be private
......................................................................
Remove temp zone rewrite logic since that zone should be private
Change-Id: I32b6ff141476f20902c2f049e3e11ac59da5eaf0
---
M files/swift/SwiftMedia/wmf/rewrite.py
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, but someone else must approve
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/files/swift/SwiftMedia/wmf/rewrite.py
b/files/swift/SwiftMedia/wmf/rewrite.py
index b343fb3..715a6b0 100644
--- a/files/swift/SwiftMedia/wmf/rewrite.py
+++ b/files/swift/SwiftMedia/wmf/rewrite.py
@@ -202,15 +202,13 @@
# =>
http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/archive/<relpath>
# (e) http://upload.wikimedia.org/<proj>/<lang>/thumb/temp/<relpath>
# =>
http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-thumb/temp/<relpath>
- # (f) http://upload.wikimedia.org/<proj>/<lang>/temp/<relpath>
- # =>
http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-temp/<relpath>
- # (g) http://upload.wikimedia.org/<proj>/<lang>/transcoded/<relpath>
+ # (f) http://upload.wikimedia.org/<proj>/<lang>/transcoded/<relpath>
# =>
http://msfe/v1/AUTH_<hash>/<proj>-<lang>-local-transcoded/<relpath>
- # (h) http://upload.wikimedia.org/<proj>/<lang>/timeline/<relpath>
+ # (g) http://upload.wikimedia.org/<proj>/<lang>/timeline/<relpath>
# =>
http://msfe/v1/AUTH_<hash>/<proj>-<lang>-timeline-render/<relpath>
# regular uploads
- match =
re.match(r'^/(?P<proj>[^/]+)/(?P<lang>[^/]+)/((?P<zone>transcoded|thumb|temp)/)?(?P<path>((temp|archive)/)?[0-9a-f]/(?P<shard>[0-9a-f]{2})/.+)$',
req.path)
+ match =
re.match(r'^/(?P<proj>[^/]+)/(?P<lang>[^/]+)/((?P<zone>transcoded|thumb)/)?(?P<path>((temp|archive)/)?[0-9a-f]/(?P<shard>[0-9a-f]{2})/.+)$',
req.path)
if match:
proj = match.group('proj')
lang = match.group('lang')
--
To view, visit https://gerrit.wikimedia.org/r/167310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32b6ff141476f20902c2f049e3e11ac59da5eaf0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
