diff options
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/checker-before-init.ts | 5 | ||||
-rw-r--r-- | server/initializers/config.ts | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 765ef157e..7945e8586 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts | |||
@@ -23,7 +23,7 @@ function checkMissedConfig () { | |||
23 | 'redundancy.videos.strategies', 'redundancy.videos.check_interval', | 23 | 'redundancy.videos.strategies', 'redundancy.videos.check_interval', |
24 | 'transcoding.enabled', 'transcoding.threads', 'transcoding.allow_additional_extensions', 'transcoding.hls.enabled', | 24 | 'transcoding.enabled', 'transcoding.threads', 'transcoding.allow_additional_extensions', 'transcoding.hls.enabled', |
25 | 'transcoding.resolutions.0p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 'transcoding.resolutions.480p', | 25 | 'transcoding.resolutions.0p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 'transcoding.resolutions.480p', |
26 | 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.2160p', | 26 | 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', 'transcoding.resolutions.2160p', |
27 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'auto_blacklist.videos.of_users.enabled', | 27 | 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'auto_blacklist.videos.of_users.enabled', |
28 | 'trending.videos.interval_days', | 28 | 'trending.videos.interval_days', |
29 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', | 29 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', |
@@ -41,7 +41,8 @@ function checkMissedConfig () { | |||
41 | 'live.enabled', 'live.allow_replay', 'live.max_duration', 'live.max_user_lives', 'live.max_instance_lives', | 41 | 'live.enabled', 'live.allow_replay', 'live.max_duration', 'live.max_user_lives', 'live.max_instance_lives', |
42 | 'live.transcoding.enabled', 'live.transcoding.threads', | 42 | 'live.transcoding.enabled', 'live.transcoding.threads', |
43 | 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', 'live.transcoding.resolutions.480p', | 43 | 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', 'live.transcoding.resolutions.480p', |
44 | 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', 'live.transcoding.resolutions.2160p' | 44 | 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', 'live.transcoding.resolutions.1440p', |
45 | 'live.transcoding.resolutions.2160p' | ||
45 | ] | 46 | ] |
46 | 47 | ||
47 | const requiredAlternatives = [ | 48 | const requiredAlternatives = [ |
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 705223b0a..0f58dc1d4 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -189,6 +189,7 @@ const CONFIG = { | |||
189 | get '480p' () { return config.get<boolean>('transcoding.resolutions.480p') }, | 189 | get '480p' () { return config.get<boolean>('transcoding.resolutions.480p') }, |
190 | get '720p' () { return config.get<boolean>('transcoding.resolutions.720p') }, | 190 | get '720p' () { return config.get<boolean>('transcoding.resolutions.720p') }, |
191 | get '1080p' () { return config.get<boolean>('transcoding.resolutions.1080p') }, | 191 | get '1080p' () { return config.get<boolean>('transcoding.resolutions.1080p') }, |
192 | get '1440p' () { return config.get<boolean>('transcoding.resolutions.1440p') }, | ||
192 | get '2160p' () { return config.get<boolean>('transcoding.resolutions.2160p') } | 193 | get '2160p' () { return config.get<boolean>('transcoding.resolutions.2160p') } |
193 | }, | 194 | }, |
194 | HLS: { | 195 | HLS: { |
@@ -221,6 +222,7 @@ const CONFIG = { | |||
221 | get '480p' () { return config.get<boolean>('live.transcoding.resolutions.480p') }, | 222 | get '480p' () { return config.get<boolean>('live.transcoding.resolutions.480p') }, |
222 | get '720p' () { return config.get<boolean>('live.transcoding.resolutions.720p') }, | 223 | get '720p' () { return config.get<boolean>('live.transcoding.resolutions.720p') }, |
223 | get '1080p' () { return config.get<boolean>('live.transcoding.resolutions.1080p') }, | 224 | get '1080p' () { return config.get<boolean>('live.transcoding.resolutions.1080p') }, |
225 | get '1440p' () { return config.get<boolean>('live.transcoding.resolutions.1440p') }, | ||
224 | get '2160p' () { return config.get<boolean>('live.transcoding.resolutions.2160p') } | 226 | get '2160p' () { return config.get<boolean>('live.transcoding.resolutions.2160p') } |
225 | } | 227 | } |
226 | } | 228 | } |