X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdefault.yaml;h=0b096cf8d32c6f72576dd1550aff751d961b1403;hb=bc0d801bb7a0cc503c1637f4a07bb51d68d85608;hp=ce2b20c75a8a698c0f0f3d075e0eb5f5424df3af;hpb=96a4a7c332db933ddd70ed1be5ecf9eae5106637;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/config/default.yaml b/config/default.yaml
index ce2b20c75..0b096cf8d 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -126,6 +126,14 @@ redundancy:
 #        strategy: 'recently-added' # Cache recently added videos
 #        min_views: 10 # Having at least x views
 
+# Other instances that duplicate your content
+remote_redundancy:
+  videos:
+    # 'nobody': Do not accept remote redundancies
+    # 'anybody': Accept remote redundancies from anybody
+    # 'followings': Accept redundancies from instance followings
+    accept_from: 'anybody'
+
 csp:
   enabled: false
   report_only: true # CSP directives are still being tested, so disable the report only mode at your own risk!
@@ -234,6 +242,10 @@ import:
   videos:
     http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html
       enabled: false
+      # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl
+      proxy:
+        enabled: false
+        url: ""
     torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file)
       enabled: false
 
@@ -245,7 +257,7 @@ auto_blacklist:
 
 instance:
   name: 'PeerTube'
-  short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.'
+  short_description: 'PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.'
   description: 'Welcome to this PeerTube instance!' # Support markdown
   terms: 'No terms for now.' # Support markdown
   code_of_conduct: '' # Supports markdown