Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130870
Change subject: Allow configuration of server port/interface in
localsettings.js.
......................................................................
Allow configuration of server port/interface in localsettings.js.
Change-Id: I60e1527e4c6fc339f12c3af76f321ed92a7399ac
---
M api/ParsoidService.js
M api/localsettings.js.example
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/70/130870/1
diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 934672b..0d57aeb 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -687,8 +687,10 @@
// Get host and port from the environment, if available
// VCAP_APP_PORT is for appfog.com support
- var port = process.env.VCAP_APP_PORT || process.env.PORT || 8000;
- var host = process.env.INTERFACE; // default bind all
+ var port = options.serverPort ||
+ process.env.VCAP_APP_PORT || process.env.PORT || 8000;
+ // default bind all
+ var host = options.serverInterface || process.env.INTERFACE;
app.on( 'error', function( err ) {
if ( err.errno === "EADDRINUSE" ) {
diff --git a/api/localsettings.js.example b/api/localsettings.js.example
index ebaaa81..a3f932b 100644
--- a/api/localsettings.js.example
+++ b/api/localsettings.js.example
@@ -37,4 +37,8 @@
//parsoidConfig.allowCORS = false;
// restrict:
//parsoidConfig.allowCORS = 'some.domain.org';
+
+ // Allow override of port/interface:
+ //parsoidConfig.serverPort = 8000;
+ //parsoidConfig.serverInterface = '127.0.0.1';
};
--
To view, visit https://gerrit.wikimedia.org/r/130870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60e1527e4c6fc339f12c3af76f321ed92a7399ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
