Merge b41595b306
into b866c33c93
This commit is contained in:
commit
47a455abd8
|
@ -33,10 +33,8 @@
|
|||
},
|
||||
|
||||
"storage": {
|
||||
"type": "memcached",
|
||||
"host": "127.0.0.1",
|
||||
"port": 11211,
|
||||
"expire": 2592000
|
||||
"path": "./data",
|
||||
"type": "file"
|
||||
},
|
||||
|
||||
"documents": {
|
|
@ -11,7 +11,7 @@ var connect_rate_limit = require('connect-ratelimit');
|
|||
var DocumentHandler = require('./lib/document_handler');
|
||||
|
||||
// Load the configuration and set some defaults
|
||||
var config = JSON.parse(fs.readFileSync('./config.js', 'utf8'));
|
||||
var config = JSON.parse(fs.readFileSync('./config.json', 'utf8'));
|
||||
config.port = process.env.PORT || config.port || 7777;
|
||||
config.host = process.env.HOST || config.host || 'localhost';
|
||||
|
||||
|
|
Loading…
Reference in New Issue