aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--config/default.yaml3
-rw-r--r--config/production.yaml.example3
-rw-r--r--server/helpers/youtube-dl.ts1
-rw-r--r--server/initializers/config.ts3
4 files changed, 10 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index b16fafa40..c315878b2 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -285,6 +285,9 @@ import:
285 videos: 285 videos:
286 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html 286 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
287 enabled: false 287 enabled: false
288 # IPv6 is very strongly rate-limited on most sites supported by youtube-dl
289 forceipv4:
290 enabled: true
288 # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl 291 # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
289 proxy: 292 proxy:
290 enabled: false 293 enabled: false
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 6c331b8b3..bbaafd9b4 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -299,6 +299,9 @@ import:
299 videos: 299 videos:
300 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html 300 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
301 enabled: false 301 enabled: false
302 # IPv6 is very strongly rate-limited on most sites supported by youtube-dl
303 forceipv4:
304 enabled: true
302 # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl 305 # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
303 proxy: 306 proxy:
304 enabled: false 307 enabled: false
diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index c2aa8870a..8733fe6cf 100644
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -34,6 +34,7 @@ const processOptions = {
34function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> { 34function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> {
35 return new Promise<YoutubeDLInfo>((res, rej) => { 35 return new Promise<YoutubeDLInfo>((res, rej) => {
36 let args = opts || [ '-j', '--flat-playlist' ] 36 let args = opts || [ '-j', '--flat-playlist' ]
37 if (CONFIG.IMPORT.VIDEOS.HTTP.FORCEIPV4) args.push('--force-ipv4')
37 args = wrapWithProxyOptions(args) 38 args = wrapWithProxyOptions(args)
38 39
39 safeGetYoutubeDL() 40 safeGetYoutubeDL()
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index b70361aa9..d1bbbc9a7 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -229,6 +229,9 @@ const CONFIG = {
229 VIDEOS: { 229 VIDEOS: {
230 HTTP: { 230 HTTP: {
231 get ENABLED () { return config.get<boolean>('import.videos.http.enabled') }, 231 get ENABLED () { return config.get<boolean>('import.videos.http.enabled') },
232 FORCEIPV4: {
233 get ENABLED () { return config.get<boolean>('import.videos.http.forceipv4.enabled') }
234 },
232 PROXY: { 235 PROXY: {
233 get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') }, 236 get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') },
234 get URL () { return config.get<string>('import.videos.http.proxy.url') } 237 get URL () { return config.get<string>('import.videos.http.proxy.url') }