X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-before-init.ts;h=c85c389cd98430da954f8cb564e1d839e951fceb;hb=0882c8e6509b2a4ea48f6c48ecb2aa4aa371500a;hp=cac24f0b664f22bde5e1ed8552d84e72151771d4;hpb=9162476fe9fe022ff24bd42ff828aca7c68129ef;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index cac24f0b6..c85c389cd 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -1,7 +1,10 @@ -import * as config from 'config' -import { promisify0 } from '../helpers/core-utils' +import { IConfig } from 'config' +import { parseSemVersion, promisify0 } from '../helpers/core-utils' import { logger } from '../helpers/logger' +// Special behaviour for config because we can reload it +const config: IConfig = require('config') + // ONLY USE CORE MODULES IN THIS FILE! // Check the config files @@ -16,34 +19,40 @@ function checkMissedConfig () { 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', 'storage.plugins', 'log.level', 'user.video_quota', 'user.video_quota_daily', + 'video_channels.max_per_user', 'csp.enabled', 'csp.report_only', 'csp.report_uri', - 'cache.previews.size', 'admin.email', 'contact_form.enabled', - 'signup.enabled', 'signup.limit', 'signup.requires_email_verification', + 'security.frameguard.enabled', + 'cache.previews.size', 'cache.captions.size', 'cache.torrents.size', 'admin.email', 'contact_form.enabled', + 'signup.enabled', 'signup.limit', 'signup.requires_email_verification', 'signup.minimum_age', 'signup.filters.cidr.whitelist', 'signup.filters.cidr.blacklist', 'redundancy.videos.strategies', 'redundancy.videos.check_interval', 'transcoding.enabled', 'transcoding.threads', 'transcoding.allow_additional_extensions', 'transcoding.hls.enabled', - 'transcoding.profile', - 'transcoding.resolutions.0p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 'transcoding.resolutions.480p', - 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', 'transcoding.resolutions.2160p', - 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'auto_blacklist.videos.of_users.enabled', + 'transcoding.profile', 'transcoding.concurrency', + 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', + 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', + 'transcoding.resolutions.2160p', + 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'auto_blacklist.videos.of_users.enabled', 'trending.videos.interval_days', + 'client.videos.miniature.prefer_author_display_name', 'client.menu.login.redirect_on_single_external_auth', 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', 'instance.is_nsfw', 'instance.default_nsfw_policy', 'instance.robots', 'instance.securitytxt', 'services.twitter.username', 'services.twitter.whitelisted', 'followers.instance.enabled', 'followers.instance.manual_approval', 'tracker.enabled', 'tracker.private', 'tracker.reject_too_many_announces', - 'history.videos.max_age', 'views.videos.remote.max_age', + 'history.videos.max_age', 'views.videos.remote.max_age', 'views.videos.local_buffer_update_interval', 'views.videos.ip_view_expiration', 'rates_limit.login.window', 'rates_limit.login.max', 'rates_limit.ask_send_email.window', 'rates_limit.ask_send_email.max', 'theme.default', 'remote_redundancy.videos.accept_from', - 'federation.videos.federate_unlisted', + 'federation.videos.federate_unlisted', 'federation.videos.cleanup_remote_interactions', + 'peertube.check_latest_version.enabled', 'peertube.check_latest_version.url', 'search.remote_uri.users', 'search.remote_uri.anonymous', 'search.search_index.enabled', 'search.search_index.url', 'search.search_index.disable_local_search', 'search.search_index.is_default_search', 'live.enabled', 'live.allow_replay', 'live.max_duration', 'live.max_user_lives', 'live.max_instance_lives', + 'live.rtmp.enabled', 'live.rtmp.port', 'live.rtmps.enabled', 'live.rtmps.port', 'live.rtmps.key_file', 'live.rtmps.cert_file', 'live.transcoding.enabled', 'live.transcoding.threads', 'live.transcoding.profile', - 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', 'live.transcoding.resolutions.480p', - 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', 'live.transcoding.resolutions.1440p', - 'live.transcoding.resolutions.2160p' + 'live.transcoding.resolutions.144p', 'live.transcoding.resolutions.240p', 'live.transcoding.resolutions.360p', + 'live.transcoding.resolutions.480p', 'live.transcoding.resolutions.720p', 'live.transcoding.resolutions.1080p', + 'live.transcoding.resolutions.1440p', 'live.transcoding.resolutions.2160p' ] const requiredAlternatives = [ @@ -102,8 +111,7 @@ async function checkFFmpeg (CONFIG: { TRANSCODING: { ENABLED: boolean } }) { function checkNodeVersion () { const v = process.version - const majorString = v.split('.')[0].replace('v', '') - const major = parseInt(majorString, 10) + const { major } = parseSemVersion(v) logger.debug('Checking NodeJS version %s.', v)