aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml2
-rw-r--r--config/production.yaml.example2
-rw-r--r--config/test.yaml1
3 files changed, 5 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 37ef4366f..9c9fd93dd 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -174,6 +174,8 @@ transcoding:
174 enabled: true 174 enabled: true
175 # Allow your users to upload .mkv, .mov, .avi, .flv videos 175 # Allow your users to upload .mkv, .mov, .avi, .flv videos
176 allow_additional_extensions: true 176 allow_additional_extensions: true
177 # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
178 allow_audio_files: true
177 threads: 1 179 threads: 1
178 resolutions: # Only created if the original video has a higher resolution, uses more storage! 180 resolutions: # Only created if the original video has a higher resolution, uses more storage!
179 240p: false 181 240p: false
diff --git a/config/production.yaml.example b/config/production.yaml.example
index f84e15670..0ab99ac45 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -188,6 +188,8 @@ transcoding:
188 enabled: true 188 enabled: true
189 # Allow your users to upload .mkv, .mov, .avi, .flv videos 189 # Allow your users to upload .mkv, .mov, .avi, .flv videos
190 allow_additional_extensions: true 190 allow_additional_extensions: true
191 # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
192 allow_audio_files: true
191 threads: 1 193 threads: 1
192 resolutions: # Only created if the original video has a higher resolution, uses more storage! 194 resolutions: # Only created if the original video has a higher resolution, uses more storage!
193 240p: false 195 240p: false
diff --git a/config/test.yaml b/config/test.yaml
index 682530840..7dabe433c 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -55,6 +55,7 @@ signup:
55transcoding: 55transcoding:
56 enabled: true 56 enabled: true
57 allow_additional_extensions: false 57 allow_additional_extensions: false
58 allow_audio_files: false
58 threads: 2 59 threads: 2
59 resolutions: 60 resolutions:
60 240p: true 61 240p: true