Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / extra-utils / server / config.ts

diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts
index 4e09e041233c6923dff840422995bab3fa3163cf..026a5e61c3e4869362bb537b6b9d04fce40849cf 100644 (file)
--- a/shared/extra-utils/server/config.ts
+++ b/shared/extra-utils/server/config.ts
@@ -90,6 +90,9 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
       },
       captions: {
         size: 3
+      },
+      torrents: {
+        size: 4
       }
     },
     signup: {
@@ -112,6 +115,8 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
       allowAdditionalExtensions: true,
       allowAudioFiles: true,
       threads: 1,
+      concurrency: 3,
+      profile: 'default',
       resolutions: {
         '0p': false,
         '240p': false,
@@ -138,6 +143,7 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
       transcoding: {
         enabled: true,
         threads: 4,
+        profile: 'default',
         resolutions: {
           '240p': true,
           '360p': true,
@@ -151,6 +157,7 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
     },
     import: {
       videos: {
+        concurrency: 3,
         http: {
           enabled: false
         },
@@ -162,7 +169,7 @@ function updateCustomSubConfig (url: string, token: string, newConfig: DeepParti
     trending: {
       videos: {
         algorithms: {
-          enabled: [ 'hot', 'most-viewed', 'most-liked' ],
+          enabled: [ 'best', 'hot', 'most-viewed', 'most-liked' ],
           default: 'hot'
         }
       }