diff --git a/config/default.toml b/config/default.toml index 87bb8d1..f0ca21a 100644 --- a/config/default.toml +++ b/config/default.toml @@ -43,6 +43,8 @@ title="wildduck-www" log="dev" secret="a cat" secure=false + # cert="" + # key="" listSize=20 [recaptcha] diff --git a/server.js b/server.js index e8dfa0c..c1a6c60 100644 --- a/server.js +++ b/server.js @@ -8,8 +8,8 @@ const config = require('wild-config'); const log = require('npmlog'); const https = require('https'); const http = require('http'); -const pem = require('pem'); const db = require('./lib/db'); +const fs = require('fs'); const port = config.www.port; const host = config.www.host; @@ -35,14 +35,10 @@ db.connect(err => { */ let getServer = next => { if (config.www.secure) { - return pem.createCertificate({ days: 1, selfSigned: true }, (err, keys) => { - if (err) { - throw err; - } - let server = https.createServer({ key: keys.serviceKey, cert: keys.certificate }, app); - - return next(null, server); - }); + let cert = fs.readFileSync(config.www.cert); + let key = fs.readFileSync(config.www.key); + let server = https.createServer({ key, cert }, app); + return next(null, server); } next(null, http.createServer(app)); };