web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #39 from ochronus/fix-content-type

Browse Source 
Using express.static instead of custom handler
This commit is contained in:
ansuz 2016-09-27 12:19:08 +02:00 committed by GitHub
commit f8b65be009
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server.js
View File

@ -23,32 +23,10 @@ Fs.exists(__dirname + "/customize", function (e) {
console.log("Cryptpad is customizable, see customize.dist/readme.md for details"); console.log("Cryptpad is customizable, see customize.dist/readme.md for details");
}); });
var staticOpts = {
index: 'index.html'
};
var handleFile = function (target, res, fallback, next) {
var stream = Fs.createReadStream(target).on('error', function (e) {
if (fallback) {
handleFile(fallback, res, undefined, next);
return;
} else {
next();
}
}).on('end', function () {
res.end();
});
stream.pipe(res);
};
app.use("/customize", Express.static(__dirname + '/customize')); app.use("/customize", Express.static(__dirname + '/customize'));
app.use("/customize", Express.static(__dirname + '/customize.dist')); app.use("/customize", Express.static(__dirname + '/customize.dist'));
app.use(/^\/[^\/]*$/, function(req, res, next) { app.use(/^\/[^\/]*$/, Express.static('customize'));
var file = req.originalUrl.slice(1) || 'index.html'; app.use(/^\/[^\/]*$/, Express.static('customize.dist'));
handleFile(__dirname + '/customize' + file, // try piping this file first
res, __dirname + '/customize.dist/' + file, // if it doesn't exist
next); // finally, fall through
});
var httpsOpts; var httpsOpts;
if (config.privKeyAndCertFiles) { if (config.privKeyAndCertFiles) {
@ -101,4 +79,4 @@ Storage.create(config, function (store) {
console.log('DB connected'); console.log('DB connected');
NetfluxSrv.run(store, wsSrv, config); NetfluxSrv.run(store, wsSrv, config);
WebRTCSrv.run(wsSrv); WebRTCSrv.run(wsSrv);
}); });