aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-01-21 15:59:57 +0100
committerChocobozzz <me@florianbigard.com>2020-01-21 16:46:59 +0100
commitbe7ca0c6b9c51c639bac7d2da94599893e7b1c01 (patch)
tree328eadc393cd7b052f8366f888e968b561ad86c2 /config
parent5e0171daaa00d7d1409b1d2408f03468e895459b (diff)
downloadPeerTube-be7ca0c6b9c51c639bac7d2da94599893e7b1c01.tar.gz
PeerTube-be7ca0c6b9c51c639bac7d2da94599893e7b1c01.tar.zst
PeerTube-be7ca0c6b9c51c639bac7d2da94599893e7b1c01.zip
Use a proxy for youtube-dl to avoid travis errors
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml4
-rw-r--r--config/production.yaml.example4
-rw-r--r--config/test.yaml3
3 files changed, 11 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index ce2b20c75..3260c62fc 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -234,6 +234,10 @@ import:
234 videos: 234 videos:
235 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html 235 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
236 enabled: false 236 enabled: false
237 # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
238 proxy:
239 enabled: false
240 url: ""
237 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) 241 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
238 enabled: false 242 enabled: false
239 243
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 52892acfb..30cd2ffe0 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -248,6 +248,10 @@ import:
248 videos: 248 videos:
249 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html 249 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
250 enabled: false 250 enabled: false
251 # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
252 proxy:
253 enabled: false
254 url: ""
251 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) 255 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
252 enabled: false 256 enabled: false
253 257
diff --git a/config/test.yaml b/config/test.yaml
index 3ab391504..5d98b41c4 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -86,6 +86,9 @@ import:
86 videos: 86 videos:
87 http: 87 http:
88 enabled: true 88 enabled: true
89 proxy:
90 enabled: false
91 url: ""
89 torrent: 92 torrent:
90 enabled: true 93 enabled: true
91 94