Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 21:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add host option (#588)

Browse Source 
* Added option to configure host

* Updated sample config
This commit is contained in:
Xavier NUNN 2019-07-09 22:50:20 +02:00 committed by zadam
parent 3d7a5f20e7
commit dcebcb0e73
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-sample.ini
View File

@ -3,6 +3,8 @@
instanceName= instanceName=
[Network] [Network]
# host setting is relevant only for web deployments - set the host on which the server will listen
# host=0.0.0.0
# port setting is relevant only for web deployments, desktop builds run on random free port # port setting is relevant only for web deployments, desktop builds run on random free port
port=8080 port=8080
# true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure). # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).

10
src/services/host.js Normal file
View File

@ -0,0 +1,10 @@
const config = require('./config');
const env = require('./env');
let environmentHost;
if (process.env.TRILIUM_HOST) {
environmentHost = process.env.TRILIUM_HOST;
}
module.exports = Promise.resolve(environmentHost || config['Network']['host'] || '0.0.0.0');

5
src/www
View File

@ -25,6 +25,7 @@ const messagingService = require('./services/messaging');
const utils = require('./services/utils'); const utils = require('./services/utils');
const sqlInit = require('./services/sql_init'); const sqlInit = require('./services/sql_init');
const port = require('./services/port'); const port = require('./services/port');
const host = require('./services/host');
const semver = require('semver'); const semver = require('semver');
if (!semver.satisfies(process.version, ">=10.5.0")) { if (!semver.satisfies(process.version, ">=10.5.0")) {
@ -36,8 +37,10 @@ let httpServer;
async function startTrilium() { async function startTrilium() {
const usedPort = await port; const usedPort = await port;
const usedHost = await host;
app.set('port', usedPort); app.set('port', usedPort);
app.set('host', usedHost);
if (config['Network']['https']) { if (config['Network']['https']) {
if (!config['Network']['keyPath'] || !config['Network']['keyPath'].trim().length) { if (!config['Network']['keyPath'] || !config['Network']['keyPath'].trim().length) {
@ -70,7 +73,7 @@ async function startTrilium() {
*/ */
httpServer.keepAliveTimeout = 120000 * 5; httpServer.keepAliveTimeout = 120000 * 5;
httpServer.listen(usedPort); httpServer.listen(usedPort, usedHost);
httpServer.on('error', onError); httpServer.on('error', onError);
httpServer.on('listening', () => debug('Listening on port' + httpServer.address().port)); httpServer.on('listening', () => debug('Listening on port' + httpServer.address().port));