X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker.js;h=dad8525fa72e10492aaf0d40c6d4a43f53e0c481;hb=b65c27aaf7f6ea193d8f3bbf6fe4220f16219e06;hp=cb62fabf49b7fe155adf0cfc5386ecf957da8c8d;hpb=37dc07b292ae4b24011a99146150869bb9c17c65;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/checker.js b/server/initializers/checker.js
index cb62fabf4..dad8525fa 100644
--- a/server/initializers/checker.js
+++ b/server/initializers/checker.js
@@ -1,22 +1,37 @@
 'use strict'
 
 const config = require('config')
+const mongoose = require('mongoose')
 
-const Users = require('../models/users')
+const Client = mongoose.model('OAuthClient')
+const User = mongoose.model('User')
 
 const checker = {
-  checkConfig: checkConfig,
-  clientsExist: clientsExist,
-  usersExist: usersExist
+  checkConfig,
+  checkMissedConfig,
+  clientsExist,
+  usersExist
 }
 
-// Check the config files
+// Some checks on configuration files
 function checkConfig () {
+  if (config.has('webserver.host')) {
+    let errorMessage = '`host` config key was renamed to `hostname` but it seems you still have a `host` key in your configuration files!'
+    errorMessage += ' Please ensure to rename your `host` configuration to `hostname`.'
+
+    return errorMessage
+  }
+
+  return null
+}
+
+// Check the config files
+function checkMissedConfig () {
   const required = [ 'listen.port',
-    'webserver.https', 'webserver.host', 'webserver.port',
-    'database.host', 'database.port', 'database.suffix',
-    'storage.certs', 'storage.uploads', 'storage.logs',
-    'network.friends' ]
+    'webserver.https', 'webserver.hostname', 'webserver.port',
+    'database.hostname', 'database.port', 'database.suffix',
+    'storage.certs', 'storage.videos', 'storage.logs', 'storage.thumbnails'
+  ]
   const miss = []
 
   for (const key of required) {
@@ -29,7 +44,7 @@ function checkConfig () {
 }
 
 function clientsExist (callback) {
-  Users.getClients(function (err, clients) {
+  Client.list(function (err, clients) {
     if (err) return callback(err)
 
     return callback(null, clients.length !== 0)
@@ -37,10 +52,10 @@ function clientsExist (callback) {
 }
 
 function usersExist (callback) {
-  Users.getUsers(function (err, users) {
+  User.countTotal(function (err, totalUsers) {
     if (err) return callback(err)
 
-    return callback(null, users.length !== 0)
+    return callback(null, totalUsers !== 0)
   })
 }