X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=config%2Fdefault.yaml;h=9a9b5833f7f4d8d8f66afc16567173bacfa50da1;hb=19f7b248d88805e6595b671a7447b0ba5e1451fa;hp=387acf43df728abc1ff170329c1e45385d199630;hpb=78881bc4fab0bb7f3bcda587ea7e2e04a13fd745;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/config/default.yaml b/config/default.yaml
index 387acf43d..9a9b5833f 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -1,3 +1,5 @@
+# /!\ YOU SHOULD NOT UPDATE THIS FILE, USE production.yaml instead /!\ #
+
 listen:
   hostname: '127.0.0.1'
   port: 9000
@@ -21,6 +23,8 @@ database:
   username: 'peertube'
   password: 'peertube'
 
+# You can also specify a 'socket' path to a unix socket but first need to
+# comment out hostname and port
 redis:
   hostname: 'localhost'
   port: 6379
@@ -60,6 +64,10 @@ admin:
 signup:
   enabled: false
   limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited
+  filters:
+    cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist
+      whitelist: []
+      blacklist: []
 
 user:
   # Default value of maximum video BYTES the user can upload (does not take into account transcoded files).
@@ -68,11 +76,11 @@ user:
 
 # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
 # In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions.
-# Uses a lot of CPU and increases storage!
+# Please, do not disable transcoding since many uploaded videos will not work
 transcoding:
   enabled: true
   threads: 1
-  resolutions: # Only created if the original video has a higher resolution
+  resolutions: # Only created if the original video has a higher resolution, uses more storage!
     240p: false
     360p: false
     480p: false
@@ -99,7 +107,7 @@ instance:
 services:
   # Cards configuration to format video in Twitter
   twitter:
-    username: '@Chocobozzz' # The Twitter @username the card should be attributed to
+    username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published
     # If true, a video player will be embedded in the Twitter feed on PeerTube video share
     # If false, we use an image link card that will redirect on your PeerTube instance
     # Change it to "true", and then test on https://cards-dev.twitter.com/validator to see if you are whitelisted