mirror of https://github.com/calzoneman/sync.git
Add passphrase support to SSL
This commit is contained in:
parent
4ba8e88e27
commit
83ea83429e
|
@ -1,3 +1,7 @@
|
||||||
|
Tue Sep 10 14:09 2013 CDT
|
||||||
|
* lib/config.js, lib/server.js: Add a config key for the passphrase
|
||||||
|
to the ssl key.
|
||||||
|
|
||||||
Mon Sep 9 22:10 2013 CDT
|
Mon Sep 9 22:10 2013 CDT
|
||||||
* lib/acp.js: Change acp-channel-unload callback to duplicate the list
|
* lib/acp.js: Change acp-channel-unload callback to duplicate the list
|
||||||
of users in the channel to prevent concurrent modification while
|
of users in the channel to prevent concurrent modification while
|
||||||
|
|
|
@ -22,6 +22,7 @@ var defaults = {
|
||||||
"io-host" : "0.0.0.0",
|
"io-host" : "0.0.0.0",
|
||||||
"enable-ssl" : false,
|
"enable-ssl" : false,
|
||||||
"ssl-keyfile" : "",
|
"ssl-keyfile" : "",
|
||||||
|
"ssl-passphrase" : "",
|
||||||
"ssl-certfile" : "",
|
"ssl-certfile" : "",
|
||||||
"ssl-port" : 443,
|
"ssl-port" : 443,
|
||||||
"asset-cache-ttl" : 0,
|
"asset-cache-ttl" : 0,
|
||||||
|
|
|
@ -218,6 +218,7 @@ var Server = {
|
||||||
|
|
||||||
var options = {
|
var options = {
|
||||||
key: key,
|
key: key,
|
||||||
|
passphrase: self.cfg["ssl-passphrase"],
|
||||||
cert: cert
|
cert: cert
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue