refactor noscript/incompatible browser messages (#3684)

[github/Chocobozzz/PeerTube.git] / config / default.yaml

diff --git a/config/default.yaml b/config/default.yaml
index 9d428f764fde075c2eedbd7c2b0a0bac06c7e8c8..22488da9932e1930828d1868c7a51bf193fd1a24 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -4,6 +4,7 @@ listen:
   hostname: '127.0.0.1'
   port: 9000
 
+# Correspond to your reverse proxy server_name/listen configuration (i.e., your public PeerTube instance URL)
 webserver:
   https: false
   hostname: 'localhost'
@@ -13,7 +14,7 @@ rates_limit:
   api:
     # 50 attempts in 10 seconds
     window: 10 seconds
-    max: 100
+    max: 50
   login:
     # 15 attempts in 5 min
     window: 5 minutes
@@ -44,6 +45,7 @@ database:
   pool:
     max: 5
 
+# Redis server for short time storage
 # You can also specify a 'socket' path to a unix socket but first need to
 # comment out hostname and port
 redis:
@@ -52,16 +54,17 @@ redis:
   auth: null
   db: 0
 
+# SMTP server to send emails
 smtp:
   # smtp or sendmail
   transport: smtp
   # Path to sendmail command. Required if you use sendmail transport
   sendmail: null
   hostname: null
-  port: 465
+  port: 465 # If you use StartTLS: 587
   username: null
   password: null
-  tls: true
+  tls: true # If you use StartTLS: false
   disable_starttls: false
   ca_file: null # Used for self signed certificates
   from_address: 'admin@example.com'
@@ -95,14 +98,22 @@ storage:
 log:
   level: 'info' # debug/info/warning/error
   rotation:
-    enabled : true
+    enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate
     maxFileSize: 12MB
     maxFiles: 20
   anonymizeIP: false
+  log_ping_requests: true
+  prettify_sql: false
 
 trending:
   videos:
     interval_days: 7 # Compute trending videos for the last x days
+    algorithms:
+      enabled:
+        - 'hot' # adaptation of the Reddit 'Hot' algorithm
+        - 'most-viewed' # default, used initially by PeerTube as the trending page
+        - 'most-liked'
+      default: 'most-viewed'
 
 # Cache remote videos on your server, to help other instances to broadcast the video
 # You can define multiple caches using different sizes/strategies
@@ -214,11 +225,20 @@ user:
 # Please, do not disable transcoding since many uploaded videos will not work
 transcoding:
   enabled: true
+
   # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos
   allow_additional_extensions: true
+
   # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
   allow_audio_files: true
+
   threads: 1
+
+  # Choose the transcoding profile
+  # New profiles can be added by plugins
+  # Available in core PeerTube: 'default'
+  profile: 'default'
+
   resolutions: # Only created if the original video has a higher resolution, uses more storage!
     0p: false # audio-only (creates mp4 without video stream, always created when enabled)
     240p: false
@@ -226,6 +246,7 @@ transcoding:
     480p: false
     720p: false
     1080p: false
+    1440p: false
     2160p: false
 
   # Generate videos in a WebTorrent format (what we do since the first PeerTube release)
@@ -262,8 +283,9 @@ live:
   # PeerTube will transcode segments in a video file
   # If the user daily/total quota is reached, PeerTube will stop the live
   # /!\ transcoding.enabled (and not live.transcoding.enabled) has to be true to create a replay
-  allow_replay: false
+  allow_replay: true
 
+  # Your firewall should accept traffic from this port in TCP if you enable live
   rtmp:
     port: 1935
 
@@ -272,12 +294,18 @@ live:
     enabled: true
     threads: 2
 
+    # Choose the transcoding profile
+    # New profiles can be added by plugins
+    # Available in core PeerTube: 'default'
+    profile: 'default'
+
     resolutions:
       240p: false
       360p: false
       480p: false
       720p: false
       1080p: false
+      1440p: false
       2160p: false
 
 import:
@@ -302,6 +330,7 @@ auto_blacklist:
     of_users:
       enabled: false
 
+# Instance settings
 instance:
   name: 'PeerTube'
   short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
@@ -399,7 +428,6 @@ followers:
 followings:
   instance:
     # If you want to automatically follow back new instance followers
-    # Only follows accepted followers (in case you enabled manual followers approbation)
     # If this option is enabled, use the mute feature instead of deleting followings
     # /!\ Don't enable this if you don't have a reactive moderation team /!\
     auto_follow_back: