mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update server.js

Browse Source
This commit is contained in:
Richter 2019-03-10 09:34:46 +01:00
parent ce819ad26f
commit 50f1e04a7c
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server.js
View File

@ -1,8 +1,14 @@
// Module laden // Module laden
var fs = require('fs');
var express = require('express'); var express = require('express');
var app = express(); var app = express();
var server = require('http').Server(app); var http = require('http') //.Server(app);
var io = require('socket.io').listen(server); var https = require('https'); //.Server(app);
var webserver = https.createServer({
key: fs.readFileSync('server_v2.key', 'utf8'),
cert: fs.readFileSync('cert_v2.pem', 'utf8')
}, app);
var io = require('socket.io').listen(webserver);
var async = require('async'); var async = require('async');
var path = require('path'); var path = require('path');
var favicon = require('serve-favicon'); var favicon = require('serve-favicon');
@ -22,7 +28,7 @@ app.use(bodyParser.urlencoded({
// Scripte einbinden // Scripte einbinden
var app_cfg = require('./server/app_cfg.js'); var app_cfg = require('./server/app_cfg.js');
var sql_cfg = require('./server/sql_cfg')(bcrypt, app_cfg); var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, app_cfg);
var sql = require('./server/sql_qry')(sql_cfg, async) var sql = require('./server/sql_qry')(sql_cfg, async)
var waip_io = require('./server/waip_io')(io, sql, async, app_cfg); var waip_io = require('./server/waip_io')(io, sql, async, app_cfg);
var udp = require('./server/udp')(app_cfg, waip_io, sql); var udp = require('./server/udp')(app_cfg, waip_io, sql);
@ -30,8 +36,18 @@ var auth = require('./server/auth')(app, app_cfg, sql_cfg, async, bcrypt, passpo
var routes = require('./server/routing')(app, sql, app_cfg, passport, auth); var routes = require('./server/routing')(app, sql, app_cfg, passport, auth);
// Server starten // Server starten
server.listen(app_cfg.global.webport, function() { webserver.listen(app_cfg.global.https_port, function() {
sql.db_log('Anwendung' ,'Wachalarm-IP-Webserver auf Port ' + app_cfg.global.webport + ' gestartet'); sql.db_log('Anwendung', 'Wachalarm-IP-Webserver auf Port ' + app_cfg.global.https_port + ' gestartet');
}); });
// Redirect all HTTP traffic to HTTPS
http.createServer(function(req, res) {
var host = req.headers.host;
host = host.replace(/:\d+$/, ":" + app_cfg.global.https_port);
res.writeHead(301, {
"Location": "https://" + host + req.url
});
res.end();
}).listen(app_cfg.global.http_port);
// TODO: auf HTTPS mit TLS1.2 umstellen, inkl. WSS // TODO: auf HTTPS mit TLS1.2 umstellen, inkl. WSS