X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.js;h=20dcc056e42493695135f70a22888ca1744c2ab7;hb=e861452fb26553177ad4e32bfb18b4fd8a5b1816;hp=e97531781dfeceb736f32b219aa4c4ef057b6893;hpb=a3ee6fa22dee4b68fcde9cd23708b471db446e11;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.js b/server/initializers/database.js
index e97531781..20dcc056e 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -1,26 +1,26 @@
 'use strict'
 
-const config = require('config')
 const mongoose = require('mongoose')
 
+const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 
 // Bootstrap models
+require('../models/user')
+require('../models/oauth-client')
+require('../models/oauth-token')
 require('../models/pods')
 require('../models/video')
 // Request model needs Video 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.connect('mongodb://' + host + ':' + port + '/' + dbname)
+  mongoose.Promise = global.Promise
+  mongoose.connect('mongodb://' + constants.CONFIG.DATABASE.HOST + ':' + constants.CONFIG.DATABASE.PORT + '/' + constants.CONFIG.DATABASE.DBNAME)
   mongoose.connection.on('error', function () {
     throw new Error('Mongodb connection error.')
   })