From 529f037294d9917a62235f8162887a8edc04c32f Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 6 Nov 2020 15:14:48 +0100
Subject: [PATCH] Revert some mistakes

---
 config/test.yaml                 | 36 ++++++++++++++++----------------
 server/initializers/constants.ts |  7 +++----
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/config/test.yaml b/config/test.yaml
index b9279b5e6..78c000383 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -37,24 +37,24 @@ log:
 
 contact_form:
   enabled: true
-#
-#redundancy:
-#  videos:
-#    check_interval: '1 minute'
-#    strategies:
-#      -
-#        size: '1000MB'
-#        min_lifetime: '10 minutes'
-#        strategy: 'most-views'
-#      -
-#        size: '1000MB'
-#        min_lifetime: '10 minutes'
-#        strategy: 'trending'
-#      -
-#        size: '1000MB'
-#        min_lifetime: '10 minutes'
-#        strategy: 'recently-added'
-#        min_views: 1
+
+redundancy:
+  videos:
+    check_interval: '1 minute'
+    strategies:
+      -
+        size: '1000MB'
+        min_lifetime: '10 minutes'
+        strategy: 'most-views'
+      -
+        size: '1000MB'
+        min_lifetime: '10 minutes'
+        strategy: 'trending'
+      -
+        size: '1000MB'
+        min_lifetime: '10 minutes'
+        strategy: 'recently-added'
+        min_views: 1
 
 cache:
   previews:
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 164de041e..e712f02a8 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -710,9 +710,9 @@ if (isTestInstance() === true) {
   STATIC_MAX_AGE.SERVER = '0'
 
   ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2
-  ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 100 * 10000 // 10 seconds
-  ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 100 * 10000 // 10 seconds
-  ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 100 * 10000 // 10 seconds
+  ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
+  ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
+  ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
 
   CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB
 
@@ -924,7 +924,6 @@ function updateWebserverUrls () {
   WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME
   WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME
   WEBSERVER.PORT = CONFIG.WEBSERVER.PORT
-  WEBSERVER.PORT = CONFIG.WEBSERVER.PORT
 
   WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH
 }