yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Fix tests

Browse source
This commit is contained in:
Chocobozzz 2024-08-14 11:07:13 +02:00
parent be4bf80883
commit 7d52f17a35
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/server-commands/src/server/server.ts
View file

@ -61,6 +61,7 @@ import { StatsCommand } from './stats-command.js'
import merge from 'lodash-es/merge.js'
export type RunServerOptions = {
autoEnableImportProxy?: boolean
hideLogs?: boolean
nodeArgs?: string[]
peertubeArgs?: string[]
@ -241,7 +242,7 @@ export class PeerTubeServer {
await this.assignCustomConfigFile()
let configOverride = this.buildConfigOverride()
let configOverride = this.buildConfigOverride(options)
if (configOverrideArg !== undefined) {
configOverride = merge(configOverride, configOverrideArg)
@ -363,8 +364,8 @@ export class PeerTubeServer {
this.customConfigFile = tmpConfigFile
}
private buildConfigOverride () {
const base = process.env.YOUTUBE_DL_PROXY
private buildConfigOverride (options: RunServerOptions) {
const base = options.autoEnableImportProxy !== false && process.env.YOUTUBE_DL_PROXY
? { import: { videos: { http: { proxies: [ process.env.YOUTUBE_DL_PROXY ] } } } }
: {}