coolaj86
/
goldilocks.js
1
0
Fork 1
Code Issues Pull Requests Releases Activity

httpsOptions

This commit is contained in:
AJ ONeal 2016-10-07 11:36:28 -06:00
parent f69bbb3d66
commit 51249791aa
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
serve.js
View File

@ -77,8 +77,9 @@ function createServer(port, pubdir, content, opts) {
server.listen(port, function () { server.listen(port, function () {
opts.port = port; opts.port = port;
opts.lrPort = 35729;
var livereload = require('livereload'); var livereload = require('livereload');
var server2 = livereload.createServer({ https: opts }); var server2 = livereload.createServer({ https: opts.httpsOptions, port: opts.lrPort });
server2.watch(pubdir); server2.watch(pubdir);
@ -130,22 +131,23 @@ function run() {
var tls = require('tls'); var tls = require('tls');
// letsencrypt // letsencrypt
var email = argv.email;
var agreeTos = argv.agreeTos || argv['agree-tos'];
var cert = require('localhost.daplie.com-certificates').merge({}); var cert = require('localhost.daplie.com-certificates').merge({});
var opts = {
key: cert.key
, cert: cert.cert
//, ca: cert.ca
, email: email var opts = {
, agreeTos: agreeTos agreeTos: argv.agreeTos || argv['agree-tos']
, debug: argv.debug
, email: argv.email
, httpsOptions: {
key: cert.key
, cert: cert.cert
//, ca: cert.ca
}
, argv: argv
}; };
var peerCa; var peerCa;
opts.SNICallback = function (servername, cb) { opts.httpsOptions.SNICallback = function (servername, cb) {
cb(null, tls.createSecureContext(opts)); cb(null, tls.createSecureContext(opts.httpsOptions));
return; return;
}; };
@ -173,8 +175,8 @@ function run() {
argv.root = [argv.root]; argv.root = [argv.root];
} }
opts.key = fs.readFileSync(argv.key); opts.httpsOptions.key = fs.readFileSync(argv.key);
opts.cert = fs.readFileSync(argv.cert); opts.httpsOptions.cert = fs.readFileSync(argv.cert);
// turn multiple-cert pemfile into array of cert strings // turn multiple-cert pemfile into array of cert strings
peerCa = argv.root.reduce(function (roots, fullpath) { peerCa = argv.root.reduce(function (roots, fullpath) {
@ -193,9 +195,9 @@ function run() {
// TODO * `--verify /path/to/root.pem` require peers to present certificates from said authority // TODO * `--verify /path/to/root.pem` require peers to present certificates from said authority
if (argv.verify) { if (argv.verify) {
opts.ca = peerCa; opts.httpsOptions.ca = peerCa;
opts.requestCert = true; opts.httpsOptions.requestCert = true;
opts.rejectUnauthorized = true; opts.httpsOptions.rejectUnauthorized = true;
} }
if (argv['serve-root']) { if (argv['serve-root']) {