Don't expose constants directly in initializers/

5 files changed, 16 insertions, 12 deletions

diff --git a/scripts/danger/clean/cleaner.ts b/scripts/danger/clean/cleaner.ts
index 009f8f7a0..d575af283 100644
--- a/scripts/danger/clean/cleaner.ts
+++ b/scripts/danger/clean/cleaner.ts
@@ -1,6 +1,7 @@
 import * as Promise from 'bluebird'
 import * as rimraf from 'rimraf'
-import { CONFIG, initDatabaseModels, sequelizeTypescript } from '../../../server/initializers'
+import { initDatabaseModels, sequelizeTypescript } from '../../../server/initializers'
+import { CONFIG } from '../../../server/initializers/config'
 
 initDatabaseModels(true)
   .then(() => {
diff --git a/scripts/optimize-old-videos.ts b/scripts/optimize-old-videos.ts
index 1bee1b0f3..a1d5345a1 100644
--- a/scripts/optimize-old-videos.ts
+++ b/scripts/optimize-old-videos.ts
@@ -1,11 +1,12 @@
-import { CONFIG, VIDEO_TRANSCODING_FPS } from '../server/initializers/constants'
-import { getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution, getDurationFromVideoFile } from '../server/helpers/ffmpeg-utils'
+import { VIDEO_TRANSCODING_FPS } from '../server/initializers/constants'
+import { getDurationFromVideoFile, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../server/helpers/ffmpeg-utils'
 import { getMaxBitrate } from '../shared/models/videos'
 import { VideoModel } from '../server/models/video/video'
 import { optimizeVideofile } from '../server/lib/video-transcoding'
 import { initDatabaseModels } from '../server/initializers'
-import { join, basename, dirname } from 'path'
-import { copy, remove, move } from 'fs-extra'
+import { basename, dirname, join } from 'path'
+import { copy, move, remove } from 'fs-extra'
+import { CONFIG } from '../server/initializers/config'
 
 run()
   .then(() => process.exit(0))
diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 66a5b8719..fe87db009 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -4,7 +4,7 @@ import { join } from 'path'
 import { createInterface } from 'readline'
 import * as winston from 'winston'
 import { labelFormatter } from '../server/helpers/logger'
-import { CONFIG } from '../server/initializers/constants'
+import { CONFIG } from '../server/initializers/config'
 import { mtimeSortFilesDesc } from '../shared/utils/logs/logs'
 
 program
diff --git a/scripts/prune-storage.ts b/scripts/prune-storage.ts
index c9e4dbd4b..4953a7439 100755
--- a/scripts/prune-storage.ts
+++ b/scripts/prune-storage.ts
@@ -1,6 +1,6 @@
 import * as prompt from 'prompt'
 import { join } from 'path'
-import { CONFIG } from '../server/initializers/constants'
+import { CONFIG } from '../server/initializers/config'
 import { VideoModel } from '../server/models/video/video'
 import { initDatabaseModels } from '../server/initializers'
 import { remove, readdir } from 'fs-extra'
diff --git a/scripts/update-host.ts b/scripts/update-host.ts
index 64eba867a..57919b998 100755
--- a/scripts/update-host.ts
+++ b/scripts/update-host.ts
@@ -1,11 +1,12 @@
-import { CONFIG, initDatabaseModels } from '../server/initializers'
+import { WEBSERVER } from '../server/initializers/constants'
 import { ActorFollowModel } from '../server/models/activitypub/actor-follow'
 import { VideoModel } from '../server/models/video/video'
 import { ActorModel } from '../server/models/activitypub/actor'
 import {
   getAccountActivityPubUrl,
+  getVideoActivityPubUrl,
   getVideoAnnounceActivityPubUrl,
-  getVideoActivityPubUrl, getVideoChannelActivityPubUrl,
+  getVideoChannelActivityPubUrl,
   getVideoCommentActivityPubUrl
 } from '../server/lib/activitypub'
 import { VideoShareModel } from '../server/models/video/video-share'
@@ -14,6 +15,7 @@ import { getServerActor } from '../server/helpers/utils'
 import { AccountModel } from '../server/models/account/account'
 import { VideoChannelModel } from '../server/models/video/video-channel'
 import { VideoStreamingPlaylistModel } from '../server/models/video/video-streaming-playlist'
+import { initDatabaseModels } from '../server/initializers'
 
 run()
   .then(() => process.exit(0))
@@ -62,7 +64,7 @@ async function run () {
     actor.url = newUrl
     actor.inboxUrl = newUrl + '/inbox'
     actor.outboxUrl = newUrl + '/outbox'
-    actor.sharedInboxUrl = CONFIG.WEBSERVER.URL + '/inbox'
+    actor.sharedInboxUrl = WEBSERVER.URL + '/inbox'
     actor.followersUrl = newUrl + '/followers'
     actor.followingUrl = newUrl + '/following'
 
@@ -123,8 +125,8 @@ async function run () {
     }
 
     for (const playlist of video.VideoStreamingPlaylists) {
-      playlist.playlistUrl = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid)
-      playlist.segmentsSha256Url = CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid)
+      playlist.playlistUrl = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid)
+      playlist.segmentsSha256Url = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid)
 
       await playlist.save()
     }