X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=config%2Fdefault.yaml;h=f7c9b620c9d5967f770356730ed4a36701c186bd;hb=16ffecabfb43858fcd185e62b960dda6a82b0003;hp=7af9c929f4961f9cf1951e1be244a8471dcd6a29;hpb=cfbe6be516808de4b45ca9d98f912999ef8daaab;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/config/default.yaml b/config/default.yaml
index 7af9c929f..f7c9b620c 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -181,7 +181,6 @@ trending:
     interval_days: 7 # Compute trending videos for the last x days
     algorithms:
       enabled:
-        - 'best' # adaptation of Reddit's 'Best' algorithm (Hot minus History)
         - 'hot' # adaptation of Reddit's 'Hot' algorithm
         - 'most-viewed' # default, used initially by PeerTube as the trending page
         - 'most-liked'
@@ -297,6 +296,16 @@ webadmin:
       # Set this to false if you don't want to allow config edition in the web interface by instance admins
       allowed: true
 
+# XML, Atom or JSON feeds
+feeds:
+  videos:
+    # Default number of videos displayed in feeds
+    count: 20
+
+  comments:
+    # Default number of comments displayed in feeds
+    count: 20
+
 cache:
   previews:
     size: 500 # Max number of previews you want to cache
@@ -412,24 +421,30 @@ live:
   rtmp:
     enabled: true
 
-    hostname: 'localhost'
+    # Listening hostname/port for RTMP server
+    # '::' to listen on IPv6 and IPv4, '0.0.0.0' to listen on IPv4
+    # Use null to automatically listen on '::' if IPv6 is available, or '0.0.0.0' otherwise
+    hostname: null
     port: 1935
 
-    # Public endpoint of your RTMP server
+    # Public hostname of your RTMP server
     # Use null to use the same value than `webserver.hostname`
     public_hostname: null
 
   rtmps:
     enabled: false
 
-    hostname: 'localhost'
+    # Listening hostname/port for RTMPS server
+    # '::' to listen on IPv6 and IPv4, '0.0.0.0' to listen on IPv4
+    # Use null to automatically listen on '::' if IPv6 is available, or '0.0.0.0' otherwise
+    hostname: null
     port: 1936
 
     # Absolute paths
     key_file: ''
     cert_file: ''
 
-    # Public endpoint of your RTMPS server
+    # Public hostname of your RTMPS server
     # Use null to use the same value than `webserver.hostname`
     public_hostname: null
 
@@ -455,6 +470,7 @@ live:
 
 video_studio:
   # Enable video edition by users (cut, add intro/outro, add watermark etc)
+  # If enabled, users can create transcoding tasks as they wish
   enabled: false
 
 import:
@@ -463,6 +479,9 @@ import:
     # Amount of import jobs to execute in parallel
     concurrency: 1
 
+    # Set a custom video import timeout to not block import queue
+    timeout: '2 hours'
+
     # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
     http:
       # We recommend to use a HTTP proxy if you enable HTTP import to prevent private URL access from this server