jenkins-bot has submitted this change and it was merged.
Change subject: Update deploy configurations; bump src to a9571305
......................................................................
Update deploy configurations; bump src to a9571305
Update the default debian settings.js from the current version of
localsettings.js.example in the Parsoid repo.
Use the single argument form of setMwApi, since the other form was
deprecated by Ie07743e6a02c5fb66f4e83ccc944c4a56ec36bc0.
Change-Id: Iee7157b7289dc8d607be820365aa68640dfb338b
---
M conf/wmf/betalabs.localsettings.js
M conf/wmf/localsettings.js
M debian/settings.js
M src
4 files changed, 120 insertions(+), 51 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conf/wmf/betalabs.localsettings.js
b/conf/wmf/betalabs.localsettings.js
index b89f1d7..0bcbafd 100644
--- a/conf/wmf/betalabs.localsettings.js
+++ b/conf/wmf/betalabs.localsettings.js
@@ -2,37 +2,37 @@
exports.setup = function(parsoidConfig) {
parsoidConfig.loadWMF = false;
- parsoidConfig.setMwApi('aawiki', { uri:
'http://aa.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('arwiki', { uri:
'http://ar.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('cawiki', { uri:
'http://ca.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('commonswiki', { uri:
'http://commons.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('dewiki', { uri:
'http://de.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('en_rtlwiki', { uri:
'http://en-rtl.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwiki', { uri:
'http://en.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwikibooks', { uri:
'http://en.wikibooks.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwikinews', { uri:
'http://en.wikinews.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwikiquote', { uri:
'http://en.wikiquote.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwikisource', { uri:
'http://en.wikisource.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwikiversity', { uri:
'http://en.wikiversity.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('enwiktionary', { uri:
'http://en.wikitionary.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('eowiki', { uri:
'http://eo.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('eswiki', { uri:
'http://es.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('fawiki', { uri:
'http://fa.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('hewiki', { uri:
'http://he.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('hiwiki', { uri:
'http://hi.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('jawiki', { uri:
'http://ja.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('kowiki', { uri:
'http://ko.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('labs', { uri:
'http://deployment.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('loginwiki', { uri:
'http://login.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('metawiki', { uri:
'http://meta.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('ruwiki', { uri:
'http://ru.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('simplewiki', { uri:
'http://simple.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('sqwiki', { uri:
'http://sq.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('testwiki', { uri:
'http://test.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('ukwiki', { uri:
'http://uk.wikipedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('wikidatawiki', { uri:
'http://wikidata.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('zerowiki', { uri:
'http://zero.wikimedia.beta.wmflabs.org/w/api.php' });
- parsoidConfig.setMwApi('zhwiki', { uri:
'http://zh.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'aawiki', uri:
'http://aa.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'arwiki', uri:
'http://ar.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'cawiki', uri:
'http://ca.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'commonswiki', uri:
'http://commons.wikimedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'dewiki', uri:
'http://de.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'en_rtlwiki', uri:
'http://en-rtl.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwiki', uri:
'http://en.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwikibooks', uri:
'http://en.wikibooks.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwikinews', uri:
'http://en.wikinews.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwikiquote', uri:
'http://en.wikiquote.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwikisource', uri:
'http://en.wikisource.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwikiversity', uri:
'http://en.wikiversity.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'enwiktionary', uri:
'http://en.wikitionary.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'eowiki', uri:
'http://eo.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'eswiki', uri:
'http://es.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'fawiki', uri:
'http://fa.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'hewiki', uri:
'http://he.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'hiwiki', uri:
'http://hi.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'jawiki', uri:
'http://ja.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'kowiki', uri:
'http://ko.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'labs', uri:
'http://deployment.wikimedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'loginwiki', uri:
'http://login.wikimedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'metawiki', uri:
'http://meta.wikimedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'ruwiki', uri:
'http://ru.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'simplewiki', uri:
'http://simple.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'sqwiki', uri:
'http://sq.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'testwiki', uri:
'http://test.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'ukwiki', uri:
'http://uk.wikipedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'wikidatawiki', uri:
'http://wikidata.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'zerowiki', uri:
'http://zero.wikimedia.beta.wmflabs.org/w/api.php' });
+ parsoidConfig.setMwApi({ prefix: 'zhwiki', uri:
'http://zh.wikipedia.beta.wmflabs.org/w/api.php' });
// Use the PHP preprocessor to expand templates via the MW API (default
true)
parsoidConfig.usePHPPreProcessor = true;
diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index c143413..fb07a1b 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -13,7 +13,8 @@
// Allow cors as we are only running on non-sensitive domains
parsoidConfig.allowCORS = '*';
- parsoidConfig.setMwApi( 'labswiki', {
+ parsoidConfig.setMwApi({
+ prefix: 'labswiki',
uri: 'https://wikitech.wikimedia.org/w/api.php',
proxy: { uri: null }
} );
diff --git a/debian/settings.js b/debian/settings.js
index 25df2f8..cadc791 100644
--- a/debian/settings.js
+++ b/debian/settings.js
@@ -1,30 +1,50 @@
-"use strict";
/*
* This is a sample configuration file.
*
* Copy this file to localsettings.js and edit that file to fit your needs.
*
- * Also see the file ParserService.js for more information.
+ * Also see:
+ * - api/server.js for more information about passing config files via
+ * the commandline.
+ * - lib/mediawiki.ParsoidConfig.js all the properties
+ * that you can configure here. Not all properties are
+ * documented here.
*/
+'use strict';
-exports.setup = function( parsoidConfig ) {
- // The URL of your MediaWiki API endpoint
- //
- // We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly for
- // other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks',
- // 'enwikivoyage' etc.
- //
- // Optionally, you can also pass in a proxy specific to this prefix
- // (overrides defaultAPIProxyURI), or null to disable proxying for
- // this end point.
- parsoidConfig.setInterwiki( 'localhost', 'http://localhost/w/api.php' );
+exports.setup = function(parsoidConfig) {
+ // Set your own user-agent string
+ // Otherwise, defaults to
"Parsoid/<current-version-defined-in-package.json>"
+ //parsoidConfig.userAgent = "My-User-Agent-String";
- // A default proxy to connect to the API endpoints. Default: undefined
- // (no proxying). Overridden by per-wiki proxy config in setInterwiki.
- // parsoidConfig.defaultAPIProxyURI = 'http://proxy.example.org:8080';
+ // The URL of your MediaWiki API endpoint.
+ parsoidConfig.setMwApi({ prefix: 'localhost', uri:
'http://localhost/w/api.php' });
+ // To specify a proxy (or proxy headers) specific to this prefix (which
+ // overrides defaultAPIProxyURI) use:
+ /*
+ parsoidConfig.setMwApi({
+ prefix: 'localhost',
+ uri: 'http://localhost/w/api.php',
+ // set `proxy` to `null` to override and force no proxying.
+ proxy: {
+ uri: 'http://my.proxy:1234/',
+ headers: { 'X-Forwarded-Proto': 'https' } // headers
are optional
+ }
+ });
+ */
+
+ // We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly
+ // for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks',
+ // 'enwikivoyage' etc. (default true)
+ //parsoidConfig.loadWMF = false;
+
+ // A default proxy to connect to the API endpoints.
+ // Default: undefined (no proxying).
+ // Overridden by per-wiki proxy config in setMwApi.
+ //parsoidConfig.defaultAPIProxyURI = 'http://proxy.example.org:8080';
// Enable debug mode (prints extra debugging messages)
- // parsoidConfig.debug = true;
+ //parsoidConfig.debug = true;
// Use the PHP preprocessor to expand templates via the MW API (default
true)
//parsoidConfig.usePHPPreProcessor = false;
@@ -32,6 +52,54 @@
// Use selective serialization (default false)
parsoidConfig.useSelser = true;
- // allow cross-domain requests to the API (default disallowed)
- //parsoidConfig.allowCORS = '*';
+ // Allow cross-domain requests to the API (default '*')
+ // Sets Access-Control-Allow-Origin header
+ // disable:
+ //parsoidConfig.allowCORS = false;
+ // restrict:
+ //parsoidConfig.allowCORS = 'some.domain.org';
+
+ // Set to true for using the default performance metrics reporting to
statsd
+ // If true, provide the statsd host/port values
+ /*
+ parsoidConfig.useDefaultPerformanceTimer = true;
+ parsoidConfig.txstatsdHost = 'statsd.domain.org';
+ parsoidConfig.txstatsdPort = 8125;
+ */
+
+ // Alternatively, define performanceTimer as follows:
+ /*
+ parsoidConfig.performanceTimer = {
+ timing: function(metricName, time) { }, // do-something-with-it
+ count: function(metricName, value) { }, // do-something-with-it
+ };
+ */
+
+ // How often should we emit a heap sample? Time in ms.
+ // This setting is only relevant if you have enabled
+ // performance monitoring either via the default metrics
+ // OR by defining your own performanceTimer properties
+ //parsoidConfig.heapUsageSampleInterval = 5 * 60 * 1000;
+
+ // Allow override of port/interface:
+ //parsoidConfig.serverPort = 8000;
+ //parsoidConfig.serverInterface = '127.0.0.1';
+
+ // The URL of your LintBridge API endpoint
+ //parsoidConfig.linterAPI = 'http://lintbridge.wmflabs.org/add';
+
+ // Require SSL certificates to be valid (default true)
+ // Set to false when using self-signed SSL certificates
+ //parsoidConfig.strictSSL = false;
+
+ // Use a different server for CSS style modules.
+ // Set to true to use bits.wikimedia.org, or to a string with the URI.
+ // Leaving it undefined (the default) will use the same URI as the MW
API,
+ // changing api.php for load.php.
+ //parsoidConfig.modulesLoadURI = true;
+
+ // Suppress some warnings from the Mediawiki API
+ // (defaults to suppressing warnings which the Parsoid team knows to
+ // be harmless)
+ //parsoidConfig.suppressMwApiWarnings = /annoying warning|other
warning/;
};
diff --git a/src b/src
index db6e640..a957130 160000
--- a/src
+++ b/src
-Subproject commit db6e6404f67a9f971b4fbefe9de239735426c738
+Subproject commit a9571305a62e74debe2ecea47f5ae51a2d2e05e9
--
To view, visit https://gerrit.wikimedia.org/r/232894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee7157b7289dc8d607be820365aa68640dfb338b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
