X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fdatabase.ts;h=b537ee59a582118f4af3ce1df78128c328dc263d;hb=2243730c8edf210c0a3ffc161bac89785f6a52f0;hp=f9e24c6b8fad2b62e6413fc85aa43726b84981a4;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/database.ts b/server/initializers/database.ts
index f9e24c6b8..b537ee59a 100644
--- a/server/initializers/database.ts
+++ b/server/initializers/database.ts
@@ -3,12 +3,12 @@ import { isTestInstance } from '../helpers/core-utils'
 import { logger } from '../helpers/logger'
 
 import { AccountModel } from '../models/account/account'
-import { AccountFollowModel } from '../models/account/account-follow'
 import { AccountVideoRateModel } from '../models/account/account-video-rate'
 import { UserModel } from '../models/account/user'
+import { ActorModel } from '../models/activitypub/actor'
+import { ActorFollowModel } from '../models/activitypub/actor-follow'
 import { ApplicationModel } from '../models/application/application'
 import { AvatarModel } from '../models/avatar/avatar'
-import { JobModel } from '../models/job/job'
 import { OAuthClientModel } from '../models/oauth/oauth-client'
 import { OAuthTokenModel } from '../models/oauth/oauth-token'
 import { ServerModel } from '../models/server/server'
@@ -17,7 +17,7 @@ import { VideoModel } from '../models/video/video'
 import { VideoAbuseModel } from '../models/video/video-abuse'
 import { VideoBlacklistModel } from '../models/video/video-blacklist'
 import { VideoChannelModel } from '../models/video/video-channel'
-import { VideoChannelShareModel } from '../models/video/video-channel-share'
+import { VideoCommentModel } from '../models/video/video-comment'
 import { VideoFileModel } from '../models/video/video-file'
 import { VideoShareModel } from '../models/video/video-share'
 import { VideoTagModel } from '../models/video/video-tag'
@@ -28,13 +28,16 @@ require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to strin
 const dbname = CONFIG.DATABASE.DBNAME
 const username = CONFIG.DATABASE.USERNAME
 const password = CONFIG.DATABASE.PASSWORD
+const host = CONFIG.DATABASE.HOSTNAME
+const port = CONFIG.DATABASE.PORT
 
 const sequelizeTypescript = new SequelizeTypescript({
   database: dbname,
   dialect: 'postgres',
+  host,
+  port,
   username,
   password,
-  modelPaths: [__dirname + '/models'],
   benchmark: isTestInstance(),
   isolationLevel: SequelizeTypescript.Transaction.ISOLATION_LEVELS.SERIALIZABLE,
   operatorsAliases: false,
@@ -50,27 +53,27 @@ const sequelizeTypescript = new SequelizeTypescript({
   }
 })
 
-async function initDatabase (silent: boolean) {
+async function initDatabaseModels (silent: boolean) {
   sequelizeTypescript.addModels([
     ApplicationModel,
+    ActorModel,
+    ActorFollowModel,
     AvatarModel,
     AccountModel,
-    JobModel,
     OAuthClientModel,
     OAuthTokenModel,
     ServerModel,
     TagModel,
     AccountVideoRateModel,
-    AccountFollowModel,
     UserModel,
     VideoAbuseModel,
     VideoChannelModel,
-    VideoChannelShareModel,
     VideoShareModel,
     VideoFileModel,
     VideoBlacklistModel,
     VideoTagModel,
-    VideoModel
+    VideoModel,
+    VideoCommentModel
   ])
 
   if (!silent) logger.info('Database %s is ready.', dbname)
@@ -81,6 +84,6 @@ async function initDatabase (silent: boolean) {
 // ---------------------------------------------------------------------------
 
 export {
-  initDatabase,
+  initDatabaseModels,
   sequelizeTypescript
 }