3 files changed, 34 insertions, 8 deletions

diff --git a/config/default.yaml b/config/default.yaml
index 3260c62fc..a0f2eb3a1 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -13,7 +13,7 @@ rates_limit:
   api:
     # 50 attempts in 10 seconds
     window: 10 seconds
-    max: 50
+    max: 100
   login:
     # 15 attempts in 5 min
     window: 5 minutes
@@ -52,6 +52,10 @@ redis:
   db: 0
 
 smtp:
+  # smtp or sendmail
+  transport: smtp
+  # Path to sendmail command. Required if you use sendmail transport
+  sendmail: null
   hostname: null
   port: 465
   username: null
@@ -126,6 +130,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!
@@ -249,7 +261,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
@@ -355,7 +367,8 @@ followings:
     # /!\ Don't enable this if you don't have a reactive moderation team /!\
     auto_follow_index:
       enabled: false
-      index_url: 'https://instances.joinpeertube.org'
+      # Host your own using https://framagit.org/framasoft/peertube/instances-peertube#peertube-auto-follow
+      index_url: ''
 
 theme:
   default: 'default'
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 30cd2ffe0..8b8c98f8c 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -53,6 +53,10 @@ redis:
 
 # 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 # If you use StartTLS: 587
   username: null
@@ -127,6 +131,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!
@@ -369,7 +381,8 @@ followings:
     # /!\ Don't enable this if you don't have a reactive moderation team /!\
     auto_follow_index:
       enabled: false
-      index_url: 'https://instances.joinpeertube.org'
+      # Host your own using https://framagit.org/framasoft/peertube/instances-peertube#peertube-auto-follow
+      index_url: ''
 
 theme:
   default: 'default'
diff --git a/config/test.yaml b/config/test.yaml
index 5758c1887..74979f3a7 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -40,18 +40,18 @@ contact_form:
 
 redundancy:
   videos:
-    check_interval: '10 minutes'
+    check_interval: '1 minute'
     strategies:
       -
-        size: '10MB'
+        size: '1000MB'
         min_lifetime: '10 minutes'
         strategy: 'most-views'
       -
-        size: '10MB'
+        size: '1000MB'
         min_lifetime: '10 minutes'
         strategy: 'trending'
       -
-        size: '10MB'
+        size: '1000MB'
         min_lifetime: '10 minutes'
         strategy: 'recently-added'
         min_views: 1