Move default configuration to config.json.

This commit is contained in:
Julien Fontanet 2015-11-17 15:49:45 +01:00
parent 7e9e179fa7
commit f0497ec16d
2 changed files with 14 additions and 11 deletions

14
config.json Normal file
View File

@ -0,0 +1,14 @@
// Vendor config: DO NOT TOUCH!
//
// See sample.config.yaml to override.
{
"http": {
"listen": [
{
"port": 80
}
],
"mounts": {}
},
"datadir": "/var/lib/xo-server/data"
}

View File

@ -60,16 +60,6 @@ const warn = (...args) => {
// ===================================================================
const DEFAULTS = {
http: {
listen: [
{ port: 80 }
],
mounts: {}
},
datadir: '/var/lib/xo-server/data'
}
const DEPRECATED_ENTRIES = [
'users',
'servers'
@ -77,7 +67,6 @@ const DEPRECATED_ENTRIES = [
async function loadConfiguration () {
const config = await appConf.load('xo-server', {
defaults: DEFAULTS,
ignoreUnknownFormats: true
})