aboutsummaryrefslogtreecommitdiffhomepage
path: root/config/production.yaml.example
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/production.yaml.example
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/production.yaml.example')
-rw-r--r--config/production.yaml.example10
1 files changed, 10 insertions, 0 deletions
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...)