Skip to content

Commit

Permalink
fix some issues with pull request, bump version 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
reaby committed Sep 15, 2022
1 parent c3163fd commit c1424ec
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bin/infoscreen3.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,6 @@ function onListening() {
? 'pipe ' + addr
: 'port ' + addr.port;

cli.info('Infoscreen is now accessible at ' + chalk.bold.white(config.serverUrl()));
cli.info('Infoscreen is now accessible at ' + chalk.bold.white(config.serverUrl));
console.log(chalk.green(">>") + chalk.white("Start complete.") + chalk.green("<<"));
}
17 changes: 11 additions & 6 deletions config-default.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@

const host = "127.0.0.1" // ip of the infoscreen interface, use external address if not develoment
const port = 8000; // port for infoscreen


let hostUrl = "http://" + (process.env.HOST || host) + ":" + (process.env.PORT || port);
if (process.env.FRONT_PROXY || false) hostUrl = "http://" + (process.env.HOST || host);

export default {
"serverListenPort": process.env.PORT || 8000,
"serverHost": process.env.HOST || "127.0.0.1",
"serverUrl": () => {
if (process.env.FRONT_PROXY || false) return "https://" + (process.env.HOST || "127.0.0.1");
else return "http://" + (process.env.HOST || "127.0.0.1") + ":" + (process.env.PORT || 8000);
},
"serverListenPort": process.env.PORT || port,
"serverHost": process.env.HOST || host,
"serverUrl": hostUrl,
"sessionKey": "generateRandomStringForSecret", // used for encrypting cookies
"streamKey": 'INFOSCREEN3', // stream key for rtmp end point
"useLocalAssets": false, // used to load javascript libraries locally from /public/assets
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "infoscreen3",
"version": "1.5.1",
"version": "1.6.0",
"private": true,
"type": "module",
"exports": "./bin/infoscreen3.js",
Expand Down Expand Up @@ -42,4 +42,4 @@
"utf-8-validate": "5.0.9",
"xmlhttprequest-ssl": "2.0.0"
}
}
}

0 comments on commit c1424ec

Please sign in to comment.