aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-07 10:07:53 +0200
committerChocobozzz <me@florianbigard.com>2018-08-08 09:30:31 +0200
commita84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4 (patch)
treecf2feafcfadb5b6e9784c86d67e692db8d599b7d /config
parent990b6a0b0c4fbebc165e5cf7cec8fbc1cbaa6c66 (diff)
downloadPeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.gz
PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.zst
PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.zip
Add import.video.torrent configuration
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml2
-rw-r--r--config/production.yaml.example2
-rw-r--r--config/test.yaml2
3 files changed, 6 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 5fa7e5945..60da192b4 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -97,6 +97,8 @@ import:
97 videos: 97 videos:
98 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html 98 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
99 enabled: false 99 enabled: false
100 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
101 enabled: false
100 102
101instance: 103instance:
102 name: 'PeerTube' 104 name: 'PeerTube'
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 635a41e9e..9e8b57829 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -111,6 +111,8 @@ import:
111 videos: 111 videos:
112 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html 112 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
113 enabled: false 113 enabled: false
114 torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
115 enabled: false
114 116
115# Instance settings 117# Instance settings
116instance: 118instance:
diff --git a/config/test.yaml b/config/test.yaml
index 3c51785f2..879b6bdd4 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -44,6 +44,8 @@ import:
44 videos: 44 videos:
45 http: 45 http:
46 enabled: true 46 enabled: true
47 torrent:
48 enabled: true
47 49
48instance: 50instance:
49 default_nsfw_policy: 'display' \ No newline at end of file 51 default_nsfw_policy: 'display' \ No newline at end of file