X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fchecker-after-init.ts;h=979c97a8b2743024bfe06e36e1c01b0fb2b34b07;hb=677012b4ee53e5099e8c90445616644e1a6af9ef;hp=e01609eefcc49e7ec4d855e365e7a91c5aa0b5c5;hpb=c2777c1dfe688c8fab1ef2fed50e360100fa9198;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts index e01609eef..979c97a8b 100644 --- a/server/initializers/checker-after-init.ts +++ b/server/initializers/checker-after-init.ts @@ -1,16 +1,16 @@ import * as config from 'config' import { isProdInstance, isTestInstance } from '../helpers/core-utils' import { UserModel } from '../models/account/user' -import { ApplicationModel } from '../models/application/application' +import { getServerActor, ApplicationModel } from '../models/application/application' import { OAuthClientModel } from '../models/oauth/oauth-client' import { URL } from 'url' import { CONFIG, isEmailEnabled } from './config' import { logger } from '../helpers/logger' -import { getServerActor } from '../helpers/utils' import { RecentlyAddedStrategy } from '../../shared/models/redundancy' import { isArray } from '../helpers/custom-validators/misc' import { uniq } from 'lodash' import { WEBSERVER } from './constants' +import { VideoRedundancyConfigFilter } from '@shared/models/redundancy/video-redundancy-config-filter.type' async function checkActivityPubUrls () { const actor = await getServerActor() @@ -54,7 +54,7 @@ function checkConfig () { const defaultNSFWPolicy = CONFIG.INSTANCE.DEFAULT_NSFW_POLICY { const available = [ 'do_not_list', 'blur', 'display' ] - if (available.indexOf(defaultNSFWPolicy) === -1) { + if (available.includes(defaultNSFWPolicy) === false) { return 'NSFW policy setting should be ' + available.join(' or ') + ' instead of ' + defaultNSFWPolicy } } @@ -64,7 +64,7 @@ function checkConfig () { if (isArray(redundancyVideos)) { const available = [ 'most-views', 'trending', 'recently-added' ] for (const r of redundancyVideos) { - if (available.indexOf(r.strategy) === -1) { + if (available.includes(r.strategy) === false) { return 'Videos redundancy should have ' + available.join(' or ') + ' strategy instead of ' + r.strategy } @@ -87,6 +87,13 @@ function checkConfig () { return 'Videos redundancy should be an array (you must uncomment lines containing - too)' } + // Remote redundancies + const acceptFrom = CONFIG.REMOTE_REDUNDANCY.VIDEOS.ACCEPT_FROM + const acceptFromValues = new Set([ 'nobody', 'anybody', 'followings' ]) + if (acceptFromValues.has(acceptFrom) === false) { + return 'remote_redundancy.videos.accept_from has an incorrect value' + } + // Check storage directory locations if (isProdInstance()) { const configStorage = config.get('storage') @@ -100,6 +107,10 @@ function checkConfig () { } } + if (CONFIG.STORAGE.VIDEOS_DIR === CONFIG.STORAGE.REDUNDANCY_DIR) { + logger.warn('Redundancy directory should be different than the videos folder.') + } + // Transcoding if (CONFIG.TRANSCODING.ENABLED) { if (CONFIG.TRANSCODING.WEBTORRENT.ENABLED === false && CONFIG.TRANSCODING.HLS.ENABLED === false) { @@ -107,8 +118,28 @@ function checkConfig () { } } - if (CONFIG.STORAGE.VIDEOS_DIR === CONFIG.STORAGE.REDUNDANCY_DIR) { - logger.warn('Redundancy directory should be different than the videos folder.') + // Broadcast message + if (CONFIG.BROADCAST_MESSAGE.ENABLED) { + const currentLevel = CONFIG.BROADCAST_MESSAGE.LEVEL + const available = [ 'info', 'warning', 'error' ] + + if (available.includes(currentLevel) === false) { + return 'Broadcast message level should be ' + available.join(' or ') + ' instead of ' + currentLevel + } + } + + // Search index + if (CONFIG.SEARCH.SEARCH_INDEX.ENABLED === true) { + if (CONFIG.SEARCH.REMOTE_URI.USERS === false) { + return 'You cannot enable search index without enabling remote URI search for users.' + } + } + + // Live + if (CONFIG.LIVE.ENABLED === true) { + if (CONFIG.LIVE.ALLOW_REPLAY === true && CONFIG.TRANSCODING.ENABLED === false) { + return 'Live allow replay cannot be enabled if transcoding is not enabled.' + } } return null