1 files changed, 42 insertions, 23 deletions

diff --git a/server/initializers/database.js b/server/initializers/database.js
index 9642231b9..f8f68adeb 100644
--- a/server/initializers/database.js
+++ b/server/initializers/database.js
@@ -10,7 +10,11 @@ const utils = require('../helpers/utils')
 
 const database = {}
 
-const sequelize = new Sequelize(constants.CONFIG.DATABASE.DBNAME, 'peertube', 'peertube', {
+const dbname = constants.CONFIG.DATABASE.DBNAME
+const username = constants.CONFIG.DATABASE.USERNAME
+const password = constants.CONFIG.DATABASE.PASSWORD
+
+const sequelize = new Sequelize(dbname, username, password, {
   dialect: 'postgres',
   host: constants.CONFIG.DATABASE.HOSTNAME,
   port: constants.CONFIG.DATABASE.PORT,
@@ -26,33 +30,48 @@ const sequelize = new Sequelize(constants.CONFIG.DATABASE.DBNAME, 'peertube', 'p
   }
 })
 
-const modelDirectory = path.join(__dirname, '..', 'models')
-fs.readdir(modelDirectory, function (err, files) {
-  if (err) throw err
+database.sequelize = sequelize
+database.Sequelize = Sequelize
+database.init = init
 
-  files.filter(function (file) {
-    if (file === 'utils.js') return false
+// ---------------------------------------------------------------------------
 
-    return true
-  })
-  .forEach(function (file) {
-    const model = sequelize.import(path.join(modelDirectory, file))
+module.exports = database
 
-    database[model.name] = model
-  })
+// ---------------------------------------------------------------------------
 
-  Object.keys(database).forEach(function (modelName) {
-    if ('associate' in database[modelName]) {
-      database[modelName].associate(database)
-    }
-  })
+function init (silent, callback) {
+  if (!callback) {
+    callback = silent
+    silent = false
+  }
 
-  logger.info('Database is ready.')
-})
+  if (!callback) callback = function () {}
 
-database.sequelize = sequelize
-database.Sequelize = Sequelize
+  const modelDirectory = path.join(__dirname, '..', 'models')
+  fs.readdir(modelDirectory, function (err, files) {
+    if (err) throw err
 
-// ---------------------------------------------------------------------------
+    files.filter(function (file) {
+      // For all models but not utils.js
+      if (file === 'utils.js') return false
 
-module.exports = database
+      return true
+    })
+    .forEach(function (file) {
+      const model = sequelize.import(path.join(modelDirectory, file))
+
+      database[model.name] = model
+    })
+
+    Object.keys(database).forEach(function (modelName) {
+      if ('associate' in database[modelName]) {
+        database[modelName].associate(database)
+      }
+    })
+
+    if (!silent) logger.info('Database is ready.')
+
+    return callback(null)
+  })
+}