mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

initial https version fix #1148

Browse source
This commit is contained in:
Wikinaut 2012-11-22 10:12:58 +01:00
parent 1899e3f48d
commit eed6b752d4
4 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/node/hooks/express.js
View file

@ -1,5 +1,4 @@
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
var http = require('http');
var express = require('express');
var settings = require('../utils/Settings');
var fs = require('fs');
@ -50,7 +49,28 @@ exports.restartServer = function () {
}
var app = express(); // New syntax for express v3
server = http.createServer(app);
if (settings.ssl) {
console.log( "SSL -- enabled");
console.log( "SSL -- server key file: " + settings.ssl.key );
console.log( "SSL -- Certificate Authority's certificate file: " + settings.ssl.cert );
options = {
key: fs.readFileSync( settings.ssl.key ),
cert: fs.readFileSync( settings.ssl.cert )
};
var https = require('https');
server = https.createServer(options, app);
} else {
console.log( "SSL -- not enabled!" );
var http = require('http');
server = http.createServer(app);
}
app.use(function (req, res, next) {
res.header("Server", serverName);