aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-02-11 14:09:23 +0100
committerChocobozzz <me@florianbigard.com>2019-02-11 14:09:23 +0100
commitb718fd22374d64534bcfe69932cf562894abed6a (patch)
tree311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /config
parentadb115f5522bea4d52456a9fc5eb4140bb064476 (diff)
parent501e961199578129629cf0567033d13efced9904 (diff)
downloadPeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz
PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst
PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip
Merge branch 'develop' into pr/1285
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml10
-rw-r--r--config/production.yaml.example10
-rw-r--r--config/test-1.yaml1
-rw-r--r--config/test-2.yaml1
-rw-r--r--config/test-3.yaml1
-rw-r--r--config/test-4.yaml1
-rw-r--r--config/test-5.yaml1
-rw-r--r--config/test-6.yaml1
-rw-r--r--config/test.yaml2
9 files changed, 28 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index e16b8c352..5a83b271e 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -48,6 +48,7 @@ storage:
48 tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... 48 tmp: 'storage/tmp/' # Used to download data (imports etc), store uploaded files before processing...
49 avatars: 'storage/avatars/' 49 avatars: 'storage/avatars/'
50 videos: 'storage/videos/' 50 videos: 'storage/videos/'
51 playlists: 'storage/playlists/'
51 redundancy: 'storage/redundancy/' 52 redundancy: 'storage/redundancy/'
52 logs: 'storage/logs/' 53 logs: 'storage/logs/'
53 previews: 'storage/previews/' 54 previews: 'storage/previews/'
@@ -138,6 +139,15 @@ transcoding:
138 480p: false 139 480p: false
139 720p: false 140 720p: false
140 1080p: false 141 1080p: false
142 # /!\ EXPERIMENTAL /!\
143 # /!\ Requires ffmpeg >= 3.4
144 # Generate HLS playlist/segments. Better playback than with WebTorrent:
145 # * Resolution change is smoother
146 # * Faster playback in particular with long videos
147 # * More stable playback (less bugs/infinite loading)
148 # /!\ Multiply videos storage by two /!\
149 hls:
150 enabled: false
141 151
142import: 152import:
143 # Add ability for your users to import remote videos (from YouTube, torrent...) 153 # Add ability for your users to import remote videos (from YouTube, torrent...)
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 661eac0d5..c54e1a516 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -49,6 +49,7 @@ storage:
49 tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... 49 tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing...
50 avatars: '/var/www/peertube/storage/avatars/' 50 avatars: '/var/www/peertube/storage/avatars/'
51 videos: '/var/www/peertube/storage/videos/' 51 videos: '/var/www/peertube/storage/videos/'
52 playlists: '/var/www/peertube/storage/playlists/'
52 redundancy: '/var/www/peertube/storage/videos/' 53 redundancy: '/var/www/peertube/storage/videos/'
53 logs: '/var/www/peertube/storage/logs/' 54 logs: '/var/www/peertube/storage/logs/'
54 previews: '/var/www/peertube/storage/previews/' 55 previews: '/var/www/peertube/storage/previews/'
@@ -151,6 +152,15 @@ transcoding:
151 480p: false 152 480p: false
152 720p: false 153 720p: false
153 1080p: false 154 1080p: false
155 # /!\ EXPERIMENTAL /!\
156 # /!\ Requires ffmpeg >= 3.4
157 # Generate HLS playlist/segments. Better playback than with WebTorrent:
158 # * Resolution change is smoother
159 # * Faster playback in particular with long videos
160 # * More stable playback (less bugs/infinite loading)
161 # /!\ Multiply videos storage by two /!\
162 hls:
163 enabled: false
154 164
155import: 165import:
156 # Add ability for your users to import remote videos (from YouTube, torrent...) 166 # Add ability for your users to import remote videos (from YouTube, torrent...)
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 8f4f66d2a..fb69818f3 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -13,6 +13,7 @@ storage:
13 tmp: 'test1/tmp/' 13 tmp: 'test1/tmp/'
14 avatars: 'test1/avatars/' 14 avatars: 'test1/avatars/'
15 videos: 'test1/videos/' 15 videos: 'test1/videos/'
16 playlists: 'test1/playlists/'
16 redundancy: 'test1/redundancy/' 17 redundancy: 'test1/redundancy/'
17 logs: 'test1/logs/' 18 logs: 'test1/logs/'
18 previews: 'test1/previews/' 19 previews: 'test1/previews/'
diff --git a/config/test-2.yaml b/config/test-2.yaml
index b6d319394..5caddaaa8 100644
--- a/config/test-2.yaml
+++ b/config/test-2.yaml
@@ -13,6 +13,7 @@ storage:
13 tmp: 'test2/tmp/' 13 tmp: 'test2/tmp/'
14 avatars: 'test2/avatars/' 14 avatars: 'test2/avatars/'
15 videos: 'test2/videos/' 15 videos: 'test2/videos/'
16 playlists: 'test2/playlists/'
16 redundancy: 'test2/redundancy/' 17 redundancy: 'test2/redundancy/'
17 logs: 'test2/logs/' 18 logs: 'test2/logs/'
18 previews: 'test2/previews/' 19 previews: 'test2/previews/'
diff --git a/config/test-3.yaml b/config/test-3.yaml
index 934401eb0..fac7ebee1 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -13,6 +13,7 @@ storage:
13 tmp: 'test3/tmp/' 13 tmp: 'test3/tmp/'
14 avatars: 'test3/avatars/' 14 avatars: 'test3/avatars/'
15 videos: 'test3/videos/' 15 videos: 'test3/videos/'
16 playlists: 'test3/playlists/'
16 redundancy: 'test3/redundancy/' 17 redundancy: 'test3/redundancy/'
17 logs: 'test3/logs/' 18 logs: 'test3/logs/'
18 previews: 'test3/previews/' 19 previews: 'test3/previews/'
diff --git a/config/test-4.yaml b/config/test-4.yaml
index ee99b250b..33033773a 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -13,6 +13,7 @@ storage:
13 tmp: 'test4/tmp/' 13 tmp: 'test4/tmp/'
14 avatars: 'test4/avatars/' 14 avatars: 'test4/avatars/'
15 videos: 'test4/videos/' 15 videos: 'test4/videos/'
16 playlists: 'test4/playlists/'
16 redundancy: 'test4/redundancy/' 17 redundancy: 'test4/redundancy/'
17 logs: 'test4/logs/' 18 logs: 'test4/logs/'
18 previews: 'test4/previews/' 19 previews: 'test4/previews/'
diff --git a/config/test-5.yaml b/config/test-5.yaml
index e2662bdd9..d365b6f2b 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -13,6 +13,7 @@ storage:
13 tmp: 'test5/tmp/' 13 tmp: 'test5/tmp/'
14 avatars: 'test5/avatars/' 14 avatars: 'test5/avatars/'
15 videos: 'test5/videos/' 15 videos: 'test5/videos/'
16 playlists: 'test5/playlists/'
16 redundancy: 'test5/redundancy/' 17 redundancy: 'test5/redundancy/'
17 logs: 'test5/logs/' 18 logs: 'test5/logs/'
18 previews: 'test5/previews/' 19 previews: 'test5/previews/'
diff --git a/config/test-6.yaml b/config/test-6.yaml
index ad39c6a9f..44541c003 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -13,6 +13,7 @@ storage:
13 tmp: 'test6/tmp/' 13 tmp: 'test6/tmp/'
14 avatars: 'test6/avatars/' 14 avatars: 'test6/avatars/'
15 videos: 'test6/videos/' 15 videos: 'test6/videos/'
16 playlists: 'test6/playlists/'
16 redundancy: 'test6/redundancy/' 17 redundancy: 'test6/redundancy/'
17 logs: 'test6/logs/' 18 logs: 'test6/logs/'
18 previews: 'test6/previews/' 19 previews: 'test6/previews/'
diff --git a/config/test.yaml b/config/test.yaml
index aba5dd73c..682530840 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -62,6 +62,8 @@ transcoding:
62 480p: true 62 480p: true
63 720p: true 63 720p: true
64 1080p: true 64 1080p: true
65 hls:
66 enabled: true
65 67
66import: 68import:
67 videos: 69 videos: