wallenstein/ztncui
1
0
Fork 0
mirror of https://github.com/key-networks/ztncui.git synced 2025-06-07 18:53:45 +02:00
Code Issues Projects Releases Wiki Activity

Enable HTTP_HOST, clean up HTTPS when not enabled

Browse source
This commit is contained in:
Jacob Myers 2020-12-08 17:55:04 -05:00
parent 537a567e29
commit d3cb150a58
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/bin/www
View file

@ -10,11 +10,6 @@ const http = require('http');
const https = require('https'); const https = require('https');
const fs = require('fs'); const fs = require('fs');
const options = {
cert: fs.readFileSync('etc/tls/fullchain.pem'),
key: fs.readFileSync('etc/tls/privkey.pem')
}
/** /**
* Get ports from environment and store in Express. * Get ports from environment and store in Express.
*/ */
@ -24,6 +19,12 @@ app.set('http_port', http_port);
const https_port = normalizePort(process.env.HTTPS_PORT || null); const https_port = normalizePort(process.env.HTTPS_PORT || null);
app.set('https_port', https_port); app.set('https_port', https_port);
/**
* Get interface address on which to listen for HTTP requests from env.
*/
const http_host = process.env.HTTP_HOST || null;
app.set('http_host', http_host);
/** /**
* Get interface address on which to listen for HTTPS requests from env. * Get interface address on which to listen for HTTPS requests from env.
*/ */
@ -45,24 +46,32 @@ const http_all_interfaces = process.env.HTTP_ALL_INTERFACES || null;
if (http_all_interfaces) { if (http_all_interfaces) {
console.log('Listening for HTTP requests on port ' + http_port + ' on all interfaces'); console.log('Listening for HTTP requests on port ' + http_port + ' on all interfaces');
app.listen(http_port); app.listen(http_port);
} else if (http_host) {
console.log('Listening for HTTP requests on port ' + http_port + ' on ' + http_host);
app.listen(http_port, http_host);
} else { } else {
console.log('Listening for HTTP requests on port ' + http_port + ' on localhost'); console.log('Listening for HTTP requests on port ' + http_port + ' on localhost');
app.listen(http_port, 'localhost'); app.listen(http_port, 'localhost');
} }
const server = https.createServer(options, app);
if (https_port) { if (https_port) {
const options = {
cert: fs.readFileSync('etc/tls/fullchain.pem'),
key: fs.readFileSync('etc/tls/privkey.pem')
}
const server = https.createServer(options, app);
if (https_host) { if (https_host) {
console.log('Listening for HTTPS requests on port ' + https_port + ' on address ' + https_host); console.log('Listening for HTTPS requests on port ' + https_port + ' on address ' + https_host);
} else { } else {
console.log('Listening for HTTPS requests on port ' + https_port + ' on all interfaces'); console.log('Listening for HTTPS requests on port ' + https_port + ' on all interfaces');
} }
server.listen(https_port, https_host); server.listen(https_port, https_host);
}
server.on('error', onError); server.on('error', onError);
server.on('listening', onListening); server.on('listening', onListening);
}
/** /**
* Normalize a port into a number, string, or false. * Normalize a port into a number, string, or false.