aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/checker-before-init.ts2
-rw-r--r--server/initializers/constants.ts10
-rw-r--r--server/initializers/installer.ts4
3 files changed, 8 insertions, 8 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts
index 2567d957b..3e1d2c589 100644
--- a/server/initializers/checker-before-init.ts
+++ b/server/initializers/checker-before-init.ts
@@ -12,7 +12,7 @@ function checkMissedConfig () {
12 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', 12 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max',
13 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', 13 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
14 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', 14 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
15 'storage.redundancy', 'storage.tmp', 'storage.playlists', 15 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists',
16 'log.level', 16 'log.level',
17 'user.video_quota', 'user.video_quota_daily', 17 'user.video_quota', 'user.video_quota_daily',
18 'csp.enabled', 'csp.report_only', 'csp.report_uri', 18 'csp.enabled', 'csp.report_only', 'csp.report_uri',
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 59c30fdee..cabb0681a 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -196,7 +196,7 @@ const CONFIG = {
196 AVATARS_DIR: buildPath(config.get<string>('storage.avatars')), 196 AVATARS_DIR: buildPath(config.get<string>('storage.avatars')),
197 LOG_DIR: buildPath(config.get<string>('storage.logs')), 197 LOG_DIR: buildPath(config.get<string>('storage.logs')),
198 VIDEOS_DIR: buildPath(config.get<string>('storage.videos')), 198 VIDEOS_DIR: buildPath(config.get<string>('storage.videos')),
199 PLAYLISTS_DIR: buildPath(config.get<string>('storage.playlists')), 199 STREAMING_PLAYLISTS_DIR: buildPath(config.get<string>('storage.streaming_playlists')),
200 REDUNDANCY_DIR: buildPath(config.get<string>('storage.redundancy')), 200 REDUNDANCY_DIR: buildPath(config.get<string>('storage.redundancy')),
201 THUMBNAILS_DIR: buildPath(config.get<string>('storage.thumbnails')), 201 THUMBNAILS_DIR: buildPath(config.get<string>('storage.thumbnails')),
202 PREVIEWS_DIR: buildPath(config.get<string>('storage.previews')), 202 PREVIEWS_DIR: buildPath(config.get<string>('storage.previews')),
@@ -625,8 +625,8 @@ const STATIC_PATHS = {
625 TORRENTS: '/static/torrents/', 625 TORRENTS: '/static/torrents/',
626 WEBSEED: '/static/webseed/', 626 WEBSEED: '/static/webseed/',
627 REDUNDANCY: '/static/redundancy/', 627 REDUNDANCY: '/static/redundancy/',
628 PLAYLISTS: { 628 STREAMING_PLAYLISTS: {
629 HLS: '/static/playlists/hls' 629 HLS: '/static/streaming-playlists/hls'
630 }, 630 },
631 AVATARS: '/static/avatars/', 631 AVATARS: '/static/avatars/',
632 VIDEO_CAPTIONS: '/static/video-captions/' 632 VIDEO_CAPTIONS: '/static/video-captions/'
@@ -670,7 +670,7 @@ const CACHE = {
670 } 670 }
671} 671}
672 672
673const HLS_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.PLAYLISTS_DIR, 'hls') 673const HLS_STREAMING_PLAYLIST_DIRECTORY = join(CONFIG.STORAGE.STREAMING_PLAYLISTS_DIR, 'hls')
674const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls') 674const HLS_REDUNDANCY_DIRECTORY = join(CONFIG.STORAGE.REDUNDANCY_DIR, 'hls')
675 675
676const MEMOIZE_TTL = { 676const MEMOIZE_TTL = {
@@ -777,7 +777,7 @@ export {
777 PRIVATE_RSA_KEY_SIZE, 777 PRIVATE_RSA_KEY_SIZE,
778 ROUTE_CACHE_LIFETIME, 778 ROUTE_CACHE_LIFETIME,
779 SORTABLE_COLUMNS, 779 SORTABLE_COLUMNS,
780 HLS_PLAYLIST_DIRECTORY, 780 HLS_STREAMING_PLAYLIST_DIRECTORY,
781 FEEDS, 781 FEEDS,
782 JOB_TTL, 782 JOB_TTL,
783 NSFW_POLICY_TYPES, 783 NSFW_POLICY_TYPES,
diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index c669606f8..349d7afb7 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -6,7 +6,7 @@ import { UserModel } from '../models/account/user'
6import { ApplicationModel } from '../models/application/application' 6import { ApplicationModel } from '../models/application/application'
7import { OAuthClientModel } from '../models/oauth/oauth-client' 7import { OAuthClientModel } from '../models/oauth/oauth-client'
8import { applicationExist, clientsExist, usersExist } from './checker-after-init' 8import { applicationExist, clientsExist, usersExist } from './checker-after-init'
9import { CACHE, CONFIG, HLS_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION } from './constants' 9import { CACHE, CONFIG, HLS_STREAMING_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION } from './constants'
10import { sequelizeTypescript } from './database' 10import { sequelizeTypescript } from './database'
11import { remove, ensureDir } from 'fs-extra' 11import { remove, ensureDir } from 'fs-extra'
12 12
@@ -74,7 +74,7 @@ function createDirectoriesIfNotExist () {
74 } 74 }
75 75
76 // Playlist directories 76 // Playlist directories
77 tasks.push(ensureDir(HLS_PLAYLIST_DIRECTORY)) 77 tasks.push(ensureDir(HLS_STREAMING_PLAYLIST_DIRECTORY))
78 78
79 return Promise.all(tasks) 79 return Promise.all(tasks)
80} 80}