Mobrovac has submitted this change and it was merged.
Change subject: html route: make RESTBase host configurable
......................................................................
html route: make RESTBase host configurable
Bug: T106149
Change-Id: I4096acb91ce8fecdf4db8e2b21b12bec9f144d90
---
M config.dev.yaml
M config.prod.yaml
M routes/mobileapp-page.js
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/config.dev.yaml b/config.dev.yaml
index 53f2456..80b5d04 100644
--- a/config.dev.yaml
+++ b/config.dev.yaml
@@ -47,3 +47,4 @@
# no_proxy_list:
# - domain1.com
# - domain2.org
+ restbase_uri: https://restbase.wikimedia.org
diff --git a/config.prod.yaml b/config.prod.yaml
index 0b2e676..beed5e6 100644
--- a/config.prod.yaml
+++ b/config.prod.yaml
@@ -33,3 +33,4 @@
port: 6927
# interface: localhost # uncomment to only listen on localhost
# more per-service config settings
+ restbase_uri: https://restbase.wikimedia.org
diff --git a/routes/mobileapp-page.js b/routes/mobileapp-page.js
index a543b16..d4da4ae 100644
--- a/routes/mobileapp-page.js
+++ b/routes/mobileapp-page.js
@@ -582,8 +582,8 @@
//dbg("req.params", req.params);
BBPromise.props({
html: preq.get({
- uri: 'http://' + req.params.domain.replace(/^(\w+\.)m\./, '$1')
- + '/api/rest_v1/page/html/' +
encodeURIComponent(req.params.title),
+ uri: app.conf.restbase_uri + '/' +
req.params.domain.replace(/^(\w+\.)m\./, '$1')
+ + '/v1/page/html/' + encodeURIComponent(req.params.title),
}),
page: pageContentPromise(req.params.domain, req.params.title),
media: galleryCollectionPromise(req.logger, req.params.domain,
req.params.title)
--
To view, visit https://gerrit.wikimedia.org/r/226671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4096acb91ce8fecdf4db8e2b21b12bec9f144d90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
Gerrit-Reviewer: Bgerstle <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Fjalapeno <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
