[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Move more confs to yaml
jenkins-bot has submitted this change and it was merged.
Change subject: Move more confs to yaml
..
Move more confs to yaml
* In the site matrix, it's www.wikidata.org, but we had here,
https://wikidata.beta.wmflabs.org/w/api.php
which seems to be where www redirects. But, should confirm this
works in practice.
Change-Id: I7ea08d37a39f94caf35370a3a9f740f489874b4a
---
M conf/wmf/betalabs.localsettings.js
M conf/wmf/localsettings.js
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
5 files changed, 29 insertions(+), 47 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conf/wmf/betalabs.localsettings.js
b/conf/wmf/betalabs.localsettings.js
index 1dcf010..98317ea 100644
--- a/conf/wmf/betalabs.localsettings.js
+++ b/conf/wmf/betalabs.localsettings.js
@@ -1,41 +1,20 @@
"use strict";
exports.setup = function(parsoidConfig) {
- parsoidConfig.setMwApi({ prefix: 'aawiki', uri:
'https://aa.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'arwiki', uri:
'https://ar.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'cawiki', uri:
'https://ca.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'commonswiki', uri:
'https://commons.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'dewiki', uri:
'https://de.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'dewiktionary', uri:
'https://de.wiktionary.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'en_rtlwiki', uri:
'https://en-rtl.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwiki', uri:
'https://en.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikibooks', uri:
'https://en.wikibooks.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikinews', uri:
'https://en.wikinews.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikiquote', uri:
'https://en.wikiquote.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikisource', uri:
'https://en.wikisource.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikiversity', uri:
'https://en.wikiversity.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikivoyage', uri:
'https://en.wikivoyage.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwiktionary', uri:
'https://en.wiktionary.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'eowiki', uri:
'https://eo.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'eswiki', uri:
'https://es.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'fawiki', uri:
'https://fa.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'hewiki', uri:
'https://he.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'hiwiki', uri:
'https://hi.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'jawiki', uri:
'https://ja.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'kowiki', uri:
'https://ko.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'labs', uri:
'https://deployment.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'loginwiki', uri:
'https://login.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'metawiki', uri:
'https://meta.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'nlwiki', uri:
'https://nl.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'ruwiki', uri:
'https://ru.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'simplewiki', uri:
'https://simple.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'sqwiki', uri:
'https://sq.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'testwiki', uri:
'https://test.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'ukwiki', uri:
'https://uk.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'wikidatawiki', uri:
'https://wikidata.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'zerowiki', uri:
'https://zero.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'zhwiki', uri:
'https://zh.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.initMwApiMap();
- // the production enwiki: a work-around to be able to use
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Move more confs to yaml
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323430
Change subject: Move more confs to yaml
..
Move more confs to yaml
* In the site matrix, it's www.wikidata.org, but we had here,
https://wikidata.beta.wmflabs.org/w/api.php
which seems to be where www redirects. But, should confirm this
works in practice.
Change-Id: I7ea08d37a39f94caf35370a3a9f740f489874b4a
---
M conf/wmf/betalabs.localsettings.js
M conf/wmf/localsettings.js
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
5 files changed, 29 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy
refs/changes/30/323430/1
diff --git a/conf/wmf/betalabs.localsettings.js
b/conf/wmf/betalabs.localsettings.js
index 982b1e6..659fb73 100644
--- a/conf/wmf/betalabs.localsettings.js
+++ b/conf/wmf/betalabs.localsettings.js
@@ -1,41 +1,20 @@
"use strict";
exports.setup = function(parsoidConfig) {
- parsoidConfig.setMwApi({ prefix: 'aawiki', uri:
'https://aa.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'arwiki', uri:
'https://ar.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'cawiki', uri:
'https://ca.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'commonswiki', uri:
'https://commons.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'dewiki', uri:
'https://de.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'dewiktionary', uri:
'https://de.wiktionary.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'en_rtlwiki', uri:
'https://en-rtl.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwiki', uri:
'https://en.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikibooks', uri:
'https://en.wikibooks.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikinews', uri:
'https://en.wikinews.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikiquote', uri:
'https://en.wikiquote.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikisource', uri:
'https://en.wikisource.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikiversity', uri:
'https://en.wikiversity.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwikivoyage', uri:
'https://en.wikivoyage.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'enwiktionary', uri:
'https://en.wiktionary.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'eowiki', uri:
'https://eo.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'eswiki', uri:
'https://es.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'fawiki', uri:
'https://fa.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'hewiki', uri:
'https://he.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'hiwiki', uri:
'https://hi.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'jawiki', uri:
'https://ja.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'kowiki', uri:
'https://ko.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'labs', uri:
'https://deployment.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'loginwiki', uri:
'https://login.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'metawiki', uri:
'https://meta.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'nlwiki', uri:
'https://nl.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'ruwiki', uri:
'https://ru.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'simplewiki', uri:
'https://simple.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'sqwiki', uri:
'https://sq.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'testwiki', uri:
'https://test.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'ukwiki', uri:
'https://uk.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'wikidatawiki', uri:
'https://wikidata.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'zerowiki', uri:
'https://zero.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi({ prefix: 'zhwiki', uri:
'https://zh.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.initMwApiMap();
- // the
