From 77d40aeb42ec39013e8d3b652b9902204aea0124 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Mon, 1 Jul 2019 22:53:51 +0800 Subject: [PATCH] add sslType --- ConfigBasic.js | 7 +++++++ server.js | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ConfigBasic.js b/ConfigBasic.js index c05cfb0..a32ca16 100644 --- a/ConfigBasic.js +++ b/ConfigBasic.js @@ -2,6 +2,13 @@ module.exports = { protocol: 'http', host: 'localhost', port: undefined, + // 如果使用 https 协议,必须填写以下内容,或在命令行参数中设置: + sslType: 'file', // file|greenlock + sslDomainList: [], + sslKey: 'ssl/privkey.pem', // ssl key file, + sslCert: 'ssl/fullchain.pem', // ssl cert file, + sslCA: 'ssl/client-cert.pem', // ssl ca file, + deploy: { host: '', // 待部署到的主机 diff --git a/server.js b/server.js index 8d9facd..8cb7a2b 100644 --- a/server.js +++ b/server.js @@ -67,7 +67,7 @@ async function init() { /*** 设置全局对象 ***/ const server = express() - const greenlock = require('greenlock-express').create({ + const greenlock = (wo.Config.sslType === 'greenlock') ? require('greenlock-express').create({ version: 'draft-11', server: 'https://acme-v02.api.letsencrypt.org/directory', // for test: acme-staging-v02 agreeTos: true, @@ -77,7 +77,7 @@ async function init() { /*** 设置全局对象 ***/ approvedDomains: wo.Config.sslDomainList, configDir: path.resolve(__dirname, 'ssl'), app: server, - }) + }) : null /*** 通用中间件 ***/ server.use(logger('development'===server.get('env')?'dev':'combined'))