moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' of github.com:calzoneman/sync into 3.0

This commit is contained in:
calzoneman 2015-02-14 13:07:35 -06:00
parent d61ba675dc 406717bb18
commit 9fea9089f4
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/config.js
View File

@ -14,12 +14,12 @@ var defaults = {
},
listen: [
{
ip: "",
ip: "0.0.0.0",
port: 8080,
http: true,
},
{
ip: "",
ip: "0.0.0.0",
port: 1337,
io: true
}
@ -169,12 +169,12 @@ function preprocessConfig(cfg) {
"and change your config.yaml to the new format.");
cfg.listen = [
{
ip: cfg.http.host,
ip: cfg.http.host || "0.0.0.0",
port: cfg.http.port,
http: true
},
{
ip: cfg.http.host,
ip: cfg.http.host || "0.0.0.0",
port: cfg.io.port,
io: true
}
@ -183,7 +183,7 @@ function preprocessConfig(cfg) {
if (cfg.https.enabled) {
cfg.listen.push(
{
ip: cfg.http.host,
ip: cfg.http.host || "0.0.0.0",
port: cfg.https.port,
https: true,
io: true
@ -245,6 +245,9 @@ function preprocessConfig(cfg) {
cfg.io["ipv6-ssl"] = "";
for (var i = 0; i < cfg.listen.length; i++) {
var srv = cfg.listen[i];
if (!srv.ip) {
srv.ip = "0.0.0.0";
}
if (!srv.io) {
continue;
}

4
package.json
View File

@ -11,9 +11,9 @@
"body-parser": "^1.10.2",
"compression": "^1.3.0",
"cookie-parser": "^1.3.3",
"cytubefilters": "git://github.com/calzoneman/cytubefilters#89f56fee",
"cytubefilters": "git://github.com/calzoneman/cytubefilters#33b7693c",
"express": "^4.11.1",
"express-minify": "^0.1.2",
"express-minify": "^0.1.3",
"graceful-fs": "^3.0.5",
"jade": "^1.9.1",
"json-typecheck": "^0.1.3",