Merge branch 'develop' into cli-wrapper

3 files changed, 38 insertions, 11 deletions

diff --git a/config/default.yaml b/config/default.yaml
index af29a4379..fa1fb628a 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -71,9 +71,18 @@ trending:
 # Once you have defined your strategies, choose which instances you want to cache in admin -> manage follows -> following
 redundancy:
   videos:
-#    -
-#      size: '10GB'
-#      strategy: 'most-views' # Cache videos that have the most views
+    check_interval: '1 hour' # How often you want to check new videos to cache
+    strategies:
+#      -
+#        size: '10GB'
+#        strategy: 'most-views' # Cache videos that have the most views
+#      -
+#        size: '10GB'
+#        strategy: 'trending' # Cache trending videos
+#      -
+#        size: '10GB'
+#        strategy: 'recently-added' # Cache recently added videos
+#        minViews: 10 # Having at least x views
 
 cache:
   previews:
@@ -135,7 +144,7 @@ instance:
   # Robot.txt rules. To disallow robots to crawl your instance and disallow indexation of your site, add '/' to "Disallow:'
   robots: |
     User-agent: *
-    Disallow: ''
+    Disallow:
   # Security.txt rules. To discourage researchers from testing your instance and disable security.txt integration, set this to an empty string.
   securitytxt:
     "# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:"
diff --git a/config/production.yaml.example b/config/production.yaml.example
index ddd43093f..4d8752206 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -72,9 +72,18 @@ trending:
 # Once you have defined your strategies, choose which instances you want to cache in admin -> manage follows -> following
 redundancy:
   videos:
-#    -
-#      size: '10GB'
-#      strategy: 'most-views' # Cache videos that have the most views
+    check_interval: '1 hour' # How often you want to check new videos to cache
+    strategies:
+#      -
+#        size: '10GB'
+#        strategy: 'most-views' # Cache videos that have the most views
+#      -
+#        size: '10GB'
+#        strategy: 'trending' # Cache trending videos
+#      -
+#        size: '10GB'
+#        strategy: 'recently-added' # Cache recently added videos
+#        minViews: 10 # Having at least x views
 
 ###############################################################################
 #
@@ -149,7 +158,7 @@ instance:
   # Robot.txt rules. To disallow robots to crawl your instance and disallow indexation of your site, add '/' to "Disallow:'
   robots: |
     User-agent: *
-    Disallow: ''
+    Disallow:
   # Security.txt rules. To discourage researchers from testing your instance and disable security.txt integration, set this to an empty string.
   securitytxt:
     "# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:"
diff --git a/config/test.yaml b/config/test.yaml
index 0f280eabd..ad94b00cd 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -23,9 +23,18 @@ log:
 
 redundancy:
   videos:
-    -
-      size: '100KB'
-      strategy: 'most-views'
+    check_interval: '5 seconds'
+    strategies:
+      -
+        size: '10MB'
+        strategy: 'most-views'
+      -
+        size: '10MB'
+        strategy: 'trending'
+      -
+        size: '10MB'
+        strategy: 'recently-added'
+        minViews: 1
 
 cache:
   previews: