diff options
Diffstat (limited to 'server/initializers/config.ts')
-rw-r--r-- | server/initializers/config.ts | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 60ab6e204..5301a1708 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts | |||
@@ -371,8 +371,8 @@ const CONFIG = { | |||
371 | HLS: { | 371 | HLS: { |
372 | get ENABLED () { return config.get<boolean>('transcoding.hls.enabled') } | 372 | get ENABLED () { return config.get<boolean>('transcoding.hls.enabled') } |
373 | }, | 373 | }, |
374 | WEBTORRENT: { | 374 | WEB_VIDEOS: { |
375 | get ENABLED () { return config.get<boolean>('transcoding.webtorrent.enabled') } | 375 | get ENABLED () { return config.get<boolean>('transcoding.web_videos.enabled') } |
376 | }, | 376 | }, |
377 | REMOTE_RUNNERS: { | 377 | REMOTE_RUNNERS: { |
378 | get ENABLED () { return config.get<boolean>('transcoding.remote_runners.enabled') } | 378 | get ENABLED () { return config.get<boolean>('transcoding.remote_runners.enabled') } |
@@ -584,16 +584,6 @@ function isEmailEnabled () { | |||
584 | return false | 584 | return false |
585 | } | 585 | } |
586 | 586 | ||
587 | // --------------------------------------------------------------------------- | ||
588 | |||
589 | export { | ||
590 | CONFIG, | ||
591 | registerConfigChangedHandler, | ||
592 | isEmailEnabled | ||
593 | } | ||
594 | |||
595 | // --------------------------------------------------------------------------- | ||
596 | |||
597 | function getLocalConfigFilePath () { | 587 | function getLocalConfigFilePath () { |
598 | const localConfigDir = getLocalConfigDir() | 588 | const localConfigDir = getLocalConfigDir() |
599 | 589 | ||
@@ -604,6 +594,17 @@ function getLocalConfigFilePath () { | |||
604 | return join(localConfigDir, filename + '.json') | 594 | return join(localConfigDir, filename + '.json') |
605 | } | 595 | } |
606 | 596 | ||
597 | // --------------------------------------------------------------------------- | ||
598 | |||
599 | export { | ||
600 | CONFIG, | ||
601 | getLocalConfigFilePath, | ||
602 | registerConfigChangedHandler, | ||
603 | isEmailEnabled | ||
604 | } | ||
605 | |||
606 | // --------------------------------------------------------------------------- | ||
607 | |||
607 | function getLocalConfigDir () { | 608 | function getLocalConfigDir () { |
608 | if (process.env.PEERTUBE_LOCAL_CONFIG) return process.env.PEERTUBE_LOCAL_CONFIG | 609 | if (process.env.PEERTUBE_LOCAL_CONFIG) return process.env.PEERTUBE_LOCAL_CONFIG |
609 | 610 | ||