X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.js;h=0564e4e77fdd824c73ff21c3f0ffc504eec0f5a9;hb=41b5da1d8cb41f5c49f0e0a01a54106c9a5925dd;hp=8626895ee6fd4cd60d8bfac71065d900399f2c84;hpb=32bb41560279dd0c75d0461f081873483e3aaed9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.js b/server/initializers/database.js
index 8626895ee..0564e4e77 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -1,30 +1,28 @@
 'use strict'
 
-const config = require('config')
 const mongoose = require('mongoose')
 
+const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 
 // Bootstrap models
+require('../models/application')
+require('../models/oauth-token')
 require('../models/user')
 require('../models/oauth-client')
-require('../models/oauth-token')
-require('../models/pods')
 require('../models/video')
 // Request model needs Video model
+require('../models/pods')
+// Request model needs Pod model
 require('../models/request')
 
-const dbname = 'peertube' + config.get('database.suffix')
-const host = config.get('database.host')
-const port = config.get('database.port')
-
 const database = {
   connect: connect
 }
 
 function connect () {
   mongoose.Promise = global.Promise
-  mongoose.connect('mongodb://' + host + ':' + port + '/' + dbname)
+  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOSTNAME + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
   mongoose.connection.on('error', function () {
     throw new Error('Mongodb connection error.')
   })