mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-24 06:13:17 +00:00
Code Issues Releases Wiki Activity

Server command: support environment variables for specifying port number

Browse Source
This commit is contained in:
Jermolene 2018-03-28 11:58:46 +01:00
parent be375c40f2
commit f4fd5e76f8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/language/en-GB/Help/server.tid
View File

@ -11,7 +11,7 @@ At the root, it serves a rendering of a specified tiddler. Away from the root, i
The parameters are: The parameters are:
* ''port'' - port number to serve from (defaults to "8080") * ''port'' - port number on which to listen; non-numeric values are interpreted as a system environment variable from which the port number is extracted (defaults to "8080")
* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all") * ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all")
* ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain") * ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain")
* ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html") * ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html")
@ -34,4 +34,8 @@ The username and password can be specified as empty strings if you need to set t
--server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245
``` ```
To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port. To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port. It can be useful to use an environment variable to set the port. This examples listens on the port number specified in the environment variable "PORT":
```
--server PORT
```

3
core/modules/commands/server.js
View File

@ -291,6 +291,9 @@ Command.prototype.execute = function() {
password = this.params[5], password = this.params[5],
host = this.params[6] || "127.0.0.1", host = this.params[6] || "127.0.0.1",
pathprefix = this.params[7]; pathprefix = this.params[7];
if(parseInt(port,10).toString() !== port) {
port = process.env[port] || 8080;
}
this.server.set({ this.server.set({
rootTiddler: rootTiddler, rootTiddler: rootTiddler,
renderType: renderType, renderType: renderType,