[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src to 7193a85 and define the mwApiServer config variable
Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328351 )
Change subject: Bump src to 7193a85 and define the mwApiServer config variable
..
Bump src to 7193a85 and define the mwApiServer config variable
Change-Id: Icf41ad54da11b10bcc9d901f473c1d9576cd319e
---
M conf/wmf/localsettings.js
M scap/templates/config.yaml.j2
M scap/vars.yaml
M src
4 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Mobrovac: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index 1ea012d..efb4cb2 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -1,9 +1,5 @@
"use strict";
exports.setup = function(parsoidConfig) {
- // Use the API backends directly without hitting the text varnishes.
- // API requests are not cacheable anyway.
- parsoidConfig.defaultAPIProxyURI = 'http://api.svc.eqiad.wmnet';
-
// Sample these verbose logs to prevent overwhelm
// 1% and 2% for empty/tr and empty/li is based on
// seeing the volume in rt-testing.
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d7a6a61..c4bf1b8 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -50,6 +50,9 @@
linting: <%= linting %>
linterSendAPI: <%= linter_send_api %>
+ mwApiServer: <%= mwapi_server if mwapi_server else '' %>
+ defaultAPIProxyURI: <%= mwapi_proxy if mwapi_proxy else '' %>
+
timeouts:
# RESTBase uses a 2 minute timeout for the first request.
#
diff --git a/scap/vars.yaml b/scap/vars.yaml
index b089a3b..1994779 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -14,3 +14,6 @@
load_wmf: true
linting: false
linter_send_api: false
+mwapi_server:
+mwapi_proxy:
+
diff --git a/src b/src
index 6719e24..7193a85 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 6719e240fd4db750f680aac21b0ac8f69e7aedcc
+Subproject commit 7193a85722fa600ee0652112b100de0c5013fb89
--
To view, visit https://gerrit.wikimedia.org/r/328351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf41ad54da11b10bcc9d901f473c1d9576cd319e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Mobrovac
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src to 7193a85 and define the mwApiServer config variable
Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328351 )
Change subject: Bump src to 7193a85 and define the mwApiServer config variable
..
Bump src to 7193a85 and define the mwApiServer config variable
Change-Id: Icf41ad54da11b10bcc9d901f473c1d9576cd319e
---
M conf/wmf/localsettings.js
M scap/templates/config.yaml.j2
M scap/vars.yaml
M src
4 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy
refs/changes/51/328351/1
diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index 1ea012d..efb4cb2 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -1,9 +1,5 @@
"use strict";
exports.setup = function(parsoidConfig) {
- // Use the API backends directly without hitting the text varnishes.
- // API requests are not cacheable anyway.
- parsoidConfig.defaultAPIProxyURI = 'http://api.svc.eqiad.wmnet';
-
// Sample these verbose logs to prevent overwhelm
// 1% and 2% for empty/tr and empty/li is based on
// seeing the volume in rt-testing.
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index d7a6a61..c4bf1b8 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -50,6 +50,9 @@
linting: <%= linting %>
linterSendAPI: <%= linter_send_api %>
+ mwApiServer: <%= mwapi_server if mwapi_server else '' %>
+ defaultAPIProxyURI: <%= mwapi_proxy if mwapi_proxy else '' %>
+
timeouts:
# RESTBase uses a 2 minute timeout for the first request.
#
diff --git a/scap/vars.yaml b/scap/vars.yaml
index b089a3b..1994779 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -14,3 +14,6 @@
load_wmf: true
linting: false
linter_send_api: false
+mwapi_server:
+mwapi_proxy:
+
diff --git a/src b/src
index 6719e24..7193a85 16
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 6719e240fd4db750f680aac21b0ac8f69e7aedcc
+Subproject commit 7193a85722fa600ee0652112b100de0c5013fb89
--
To view, visit https://gerrit.wikimedia.org/r/328351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf41ad54da11b10bcc9d901f473c1d9576cd319e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
