aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-03 11:10:31 +0200
committerChocobozzz <me@florianbigard.com>2018-08-06 11:19:16 +0200
commit5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e (patch)
treedd992ea798c620b8bdb5bf5fd9b8f1b97d4410f2 /config
parent7e5f9f001d5de22c54748f935edc0c069028bb0e (diff)
downloadPeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.tar.gz
PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.tar.zst
PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.zip
Add import http enabled configuration
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml2
-rw-r--r--config/production.yaml.example6
-rw-r--r--config/test.yaml5
3 files changed, 12 insertions, 1 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 722b33db3..5fa7e5945 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -96,7 +96,7 @@ import:
96 # Add ability for your users to import remote videos (from YouTube, torrent...) 96 # Add ability for your users to import remote videos (from YouTube, torrent...)
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: true 99 enabled: false
100 100
101instance: 101instance:
102 name: 'PeerTube' 102 name: 'PeerTube'
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 6087e78be..635a41e9e 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -106,6 +106,12 @@ transcoding:
106 720p: false 106 720p: false
107 1080p: false 107 1080p: false
108 108
109import:
110 # Add ability for your users to import remote videos (from YouTube, torrent...)
111 videos:
112 http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
113 enabled: false
114
109# Instance settings 115# Instance settings
110instance: 116instance:
111 name: 'PeerTube' 117 name: 'PeerTube'
diff --git a/config/test.yaml b/config/test.yaml
index ffe736b24..3c51785f2 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -40,5 +40,10 @@ transcoding:
40 720p: true 40 720p: true
41 1080p: true 41 1080p: true
42 42
43import:
44 videos:
45 http:
46 enabled: true
47
43instance: 48instance:
44 default_nsfw_policy: 'display' \ No newline at end of file 49 default_nsfw_policy: 'display' \ No newline at end of file