Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361479 )
Change subject: Serve thumbnails for all public wikis with Thumbor
......................................................................
Serve thumbnails for all public wikis with Thumbor
Bug: T167796
Change-Id: I4a4457b966595d2153b8a3b2f7a28c5bc783aab7
---
M hieradata/common/swift/proxy.yaml
M modules/swift/files/SwiftMedia/wmf/rewrite.py
M modules/swift/manifests/proxy.pp
M modules/swift/templates/proxy-server.conf.erb
4 files changed, 3 insertions(+), 330 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/361479/1
diff --git a/hieradata/common/swift/proxy.yaml
b/hieradata/common/swift/proxy.yaml
index ef6de99..96e9eb8 100644
--- a/hieradata/common/swift/proxy.yaml
+++ b/hieradata/common/swift/proxy.yaml
@@ -55,316 +55,3 @@
'wikipedia-zh-local-thumb', 'wikipedia-zh-local-transcoded'
# no trailing comma!
]
-
-swift::proxy::thumbor_wiki_list: [
- 'mediawiki-www',
- 'wikimedia-commons',
- 'wikipedia-aa',
- 'wikipedia-ab',
- 'wikipedia-ace',
- 'wikipedia-ady',
- 'wikipedia-af',
- 'wikipedia-ak',
- 'wikipedia-als',
- 'wikipedia-am',
- 'wikipedia-ang',
- 'wikipedia-an',
- 'wikipedia-arbcom_cs',
- 'wikipedia-arbcom_de',
- 'wikipedia-arbcom_en',
- 'wikipedia-arbcom_fi',
- 'wikipedia-arbcom_nl',
- 'wikipedia-arc',
- 'wikipedia-ar',
- 'wikipedia-arz',
- 'wikipedia-ast',
- 'wikipedia-as',
- 'wikipedia-atj',
- 'wikipedia-av',
- 'wikipedia-ay',
- 'wikipedia-az',
- 'wikipedia-azb',
- 'wikipedia-bar',
- 'wikipedia-bat_smg',
- 'wikipedia-ba',
- 'wikipedia-bcl',
- 'wikipedia-be_x_old',
- 'wikipedia-be',
- 'wikipedia-bg',
- 'wikipedia-bh',
- 'wikipedia-bi',
- 'wikipedia-bjn',
- 'wikipedia-bm',
- 'wikipedia-bn',
- 'wikipedia-bo',
- 'wikipedia-bpy',
- 'wikipedia-br',
- 'wikipedia-bs',
- 'wikipedia-bug',
- 'wikipedia-bxr',
- 'wikipedia-ca',
- 'wikipedia-cbk_zam',
- 'wikipedia-cdo',
- 'wikipedia-ceb',
- 'wikipedia-ce',
- 'wikipedia-cho',
- 'wikipedia-chr',
- 'wikipedia-ch',
- 'wikipedia-chy',
- 'wikipedia-ckb',
- 'wikipedia-co',
- 'wikipedia-crh',
- 'wikipedia-cr',
- 'wikipedia-csb',
- 'wikipedia-cs',
- 'wikipedia-cu',
- 'wikipedia-cv',
- 'wikipedia-cy',
- 'wikipedia-da',
- 'wikipedia-de',
- 'wikipedia-diq',
- 'wikipedia-dsb',
- 'wikipedia-dty',
- 'wikipedia-dv',
- 'wikipedia-dz',
- 'wikipedia-ee',
- 'wikipedia-el',
- 'wikipedia-eml',
- 'wikipedia-en',
- 'wikipedia-eo',
- 'wikipedia-es',
- 'wikipedia-et',
- 'wikipedia-eu',
- 'wikipedia-ext',
- 'wikipedia-fa',
- 'wikipedia-ff',
- 'wikipedia-fiu_vro',
- 'wikipedia-fi',
- 'wikipedia-fj',
- 'wikipedia-fo',
- 'wikipedia-frp',
- 'wikipedia-frr',
- 'wikipedia-fr',
- 'wikipedia-fur',
- 'wikipedia-fy',
- 'wikipedia-gag',
- 'wikipedia-gan',
- 'wikipedia-ga',
- 'wikipedia-gd',
- 'wikipedia-glk',
- 'wikipedia-gl',
- 'wikipedia-gn',
- 'wikipedia-gom',
- 'wikipedia-got',
- 'wikipedia-gu',
- 'wikipedia-gv',
- 'wikipedia-hak',
- 'wikipedia-ha',
- 'wikipedia-haw',
- 'wikipedia-he',
- 'wikipedia-hif',
- 'wikipedia-hi',
- 'wikipedia-ho',
- 'wikipedia-hr',
- 'wikipedia-hsb',
- 'wikipedia-ht',
- 'wikipedia-hu',
- 'wikipedia-hy',
- 'wikipedia-hz',
- 'wikipedia-ia',
- 'wikipedia-id',
- 'wikipedia-ie',
- 'wikipedia-ig',
- 'wikipedia-ii',
- 'wikipedia-ik',
- 'wikipedia-ilo',
- 'wikipedia-io',
- 'wikipedia-is',
- 'wikipedia-it',
- 'wikipedia-iu',
- 'wikipedia-ja',
- 'wikipedia-jam',
- 'wikipedia-jbo',
- 'wikipedia-jv',
- 'wikipedia-kaa',
- 'wikipedia-kab',
- 'wikipedia-ka',
- 'wikipedia-kbd',
- 'wikipedia-kg',
- 'wikipedia-ki',
- 'wikipedia-kj',
- 'wikipedia-kk',
- 'wikipedia-kl',
- 'wikipedia-km',
- 'wikipedia-kn',
- 'wikipedia-koi',
- 'wikipedia-ko',
- 'wikipedia-krc',
- 'wikipedia-kr',
- 'wikipedia-ksh',
- 'wikipedia-ks',
- 'wikipedia-ku',
- 'wikipedia-kv',
- 'wikipedia-kw',
- 'wikipedia-ky',
- 'wikipedia-lad',
- 'wikipedia-la',
- 'wikipedia-lbe',
- 'wikipedia-lb',
- 'wikipedia-lez',
- 'wikipedia-lg',
- 'wikipedia-lij',
- 'wikipedia-li',
- 'wikipedia-lmo',
- 'wikipedia-ln',
- 'wikipedia-lo',
- 'wikipedia-lrc',
- 'wikipedia-ltg',
- 'wikipedia-lt',
- 'wikipedia-lv',
- 'wikipedia-mai',
- 'wikipedia-map_bms',
- 'wikipedia-mdf',
- 'wikipedia-mg',
- 'wikipedia-mhr',
- 'wikipedia-mh',
- 'wikipedia-min',
- 'wikipedia-mi',
- 'wikipedia-mk',
- 'wikipedia-ml',
- 'wikipedia-mn',
- 'wikipedia-mo',
- 'wikipedia-mrj',
- 'wikipedia-mr',
- 'wikipedia-ms',
- 'wikipedia-mt',
- 'wikipedia-mus',
- 'wikipedia-mwl',
- 'wikipedia-myv',
- 'wikipedia-my',
- 'wikipedia-mzn',
- 'wikipedia-nah',
- 'wikipedia-nap',
- 'wikipedia-na',
- 'wikipedia-nds_nl',
- 'wikipedia-nds',
- 'wikipedia-ne',
- 'wikipedia-new',
- 'wikipedia-ng',
- 'wikipedia-nl',
- 'wikipedia-nn',
- 'wikipedia-nov',
- 'wikipedia-no',
- 'wikipedia-nrm',
- 'wikipedia-nso',
- 'wikipedia-nv',
- 'wikipedia-ny',
- 'wikipedia-oc',
- 'wikipedia-olo',
- 'wikipedia-om',
- 'wikipedia-or',
- 'wikipedia-os',
- 'wikipedia-pag',
- 'wikipedia-pam',
- 'wikipedia-pap',
- 'wikipedia-pa',
- 'wikipedia-pcd',
- 'wikipedia-pdc',
- 'wikipedia-pfl',
- 'wikipedia-pih',
- 'wikipedia-pi',
- 'wikipedia-pl',
- 'wikipedia-pms',
- 'wikipedia-pnb',
- 'wikipedia-pnt',
- 'wikipedia-ps',
- 'wikipedia-pt',
- 'wikipedia-qu',
- 'wikipedia-rm',
- 'wikipedia-rmy',
- 'wikipedia-rn',
- 'wikipedia-roa_rup',
- 'wikipedia-roa_tara',
- 'wikipedia-ro',
- 'wikipedia-rue',
- 'wikipedia-ru',
- 'wikipedia-rw',
- 'wikipedia-sah',
- 'wikipedia-sa',
- 'wikipedia-scn',
- 'wikipedia-sco',
- 'wikipedia-sc',
- 'wikipedia-sd',
- 'wikipedia-se',
- 'wikipedia-sg',
- 'wikipedia-sh',
- 'wikipedia-simple',
- 'wikipedia-si',
- 'wikipedia-sk',
- 'wikipedia-sl',
- 'wikipedia-sm',
- 'wikipedia-sn',
- 'wikipedia-so',
- 'wikipedia-sq',
- 'wikipedia-srn',
- 'wikipedia-sr',
- 'wikipedia-ss',
- 'wikipedia-stq',
- 'wikipedia-st',
- 'wikipedia-su',
- 'wikipedia-sv',
- 'wikipedia-sw',
- 'wikipedia-szl',
- 'wikipedia-ta',
- 'wikipedia-tcy',
- 'wikipedia-ten',
- 'wikipedia-test',
- 'wikipedia-test2',
- 'wikipedia-tet',
- 'wikipedia-te',
- 'wikipedia-tg',
- 'wikipedia-th',
- 'wikipedia-ti',
- 'wikipedia-tk',
- 'wikipedia-tl',
- 'wikipedia-tn',
- 'wikipedia-to',
- 'wikipedia-tpi',
- 'wikipedia-tr',
- 'wikipedia-ts',
- 'wikipedia-tt',
- 'wikipedia-tum',
- 'wikipedia-tw',
- 'wikipedia-tyv',
- 'wikipedia-ty',
- 'wikipedia-udm',
- 'wikipedia-ug',
- 'wikipedia-uk',
- 'wikipedia-ur',
- 'wikipedia-uz',
- 'wikipedia-vec',
- 'wikipedia-vep',
- 'wikipedia-ve',
- 'wikipedia-vi',
- 'wikipedia-vls',
- 'wikipedia-vo',
- 'wikipedia-war',
- 'wikipedia-wa',
- 'wikipedia-wg_en',
- 'wikipedia-wo',
- 'wikipedia-wuu',
- 'wikipedia-xal',
- 'wikipedia-xh',
- 'wikipedia-xmf',
- 'wikipedia-yi',
- 'wikipedia-yo',
- 'wikipedia-za',
- 'wikipedia-zea',
- 'wikipedia-zero',
- 'wikipedia-zh_classical',
- 'wikipedia-zh_min_nan',
- 'wikipedia-zh_yue',
- 'wikipedia-zh',
- 'wikipedia-zu'
-# no trailing comma!
-]
diff --git a/modules/swift/files/SwiftMedia/wmf/rewrite.py
b/modules/swift/files/SwiftMedia/wmf/rewrite.py
index ec76125..f3af343 100644
--- a/modules/swift/files/SwiftMedia/wmf/rewrite.py
+++ b/modules/swift/files/SwiftMedia/wmf/rewrite.py
@@ -34,11 +34,7 @@
self.account = conf['account'].strip()
self.thumbhost = conf['thumbhost'].strip()
- self.thumborhost = conf['thumborhost'].strip() if 'thumborhost' in
conf else None
- if 'thumbor_wiki_list' in conf:
- self.thumbor_wiki_list = [item.strip() for item in
conf['thumbor_wiki_list'].split(',')]
- else:
- self.thumbor_wiki_list = None
+ self.thumborhost = conf['thumborhost'].strip()
self.user_agent = conf['user_agent'].strip()
self.bind_port = conf['bind_port'].strip()
self.shard_container_list = [
@@ -149,13 +145,7 @@
else:
self.logger.warn("no sitelang match on encodedurl: %s" %
encodedurl)
- if self.thumborhost:
- if not self.thumbor_wiki_list or '-'.join((proj, lang)) in
self.thumbor_wiki_list:
- upcopy = thumbor_opener.open(thumbor_encodedurl)
- else:
- upcopy = opener.open(encodedurl)
- else:
- upcopy = opener.open(encodedurl)
+ upcopy = thumbor_opener.open(thumbor_encodedurl)
except urllib2.HTTPError, error:
# copy the urllib2 HTTPError into a webob HTTPError class as-is
diff --git a/modules/swift/manifests/proxy.pp b/modules/swift/manifests/proxy.pp
index 8c47655..6b3ceba 100644
--- a/modules/swift/manifests/proxy.pp
+++ b/modules/swift/manifests/proxy.pp
@@ -15,7 +15,6 @@
$dispersion_account = undef,
$tld = 'org',
$thumborhost = '',
- $thumbor_wiki_list = [],
) {
package {[
'swift-proxy',
diff --git a/modules/swift/templates/proxy-server.conf.erb
b/modules/swift/templates/proxy-server.conf.erb
index 537b35f..9833a88 100644
--- a/modules/swift/templates/proxy-server.conf.erb
+++ b/modules/swift/templates/proxy-server.conf.erb
@@ -79,10 +79,7 @@
backend_url_format = <%= @backend_url_format %>
tld = <%= @tld %>
-<%- unless @thumborhost.empty? or @thumbor_wiki_list.empty? -%>
-# mirror thumbnail requests to thumbor
+# sending thumbnail requests to thumbor
thumborhost = <%= @thumborhost %>
-thumbor_wiki_list = <%= @thumbor_wiki_list.join(',') %>
-<%- end -%>
paste.filter_factory = wmf.rewrite:filter_factory
--
To view, visit https://gerrit.wikimedia.org/r/361479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a4457b966595d2153b8a3b2f7a28c5bc783aab7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
