diff options
-rw-r--r-- | config/test.yaml | 36 | ||||
-rw-r--r-- | 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: | |||
37 | 37 | ||
38 | contact_form: | 38 | contact_form: |
39 | enabled: true | 39 | enabled: true |
40 | # | 40 | |
41 | #redundancy: | 41 | redundancy: |
42 | # videos: | 42 | videos: |
43 | # check_interval: '1 minute' | 43 | check_interval: '1 minute' |
44 | # strategies: | 44 | strategies: |
45 | # - | 45 | - |
46 | # size: '1000MB' | 46 | size: '1000MB' |
47 | # min_lifetime: '10 minutes' | 47 | min_lifetime: '10 minutes' |
48 | # strategy: 'most-views' | 48 | strategy: 'most-views' |
49 | # - | 49 | - |
50 | # size: '1000MB' | 50 | size: '1000MB' |
51 | # min_lifetime: '10 minutes' | 51 | min_lifetime: '10 minutes' |
52 | # strategy: 'trending' | 52 | strategy: 'trending' |
53 | # - | 53 | - |
54 | # size: '1000MB' | 54 | size: '1000MB' |
55 | # min_lifetime: '10 minutes' | 55 | min_lifetime: '10 minutes' |
56 | # strategy: 'recently-added' | 56 | strategy: 'recently-added' |
57 | # min_views: 1 | 57 | min_views: 1 |
58 | 58 | ||
59 | cache: | 59 | cache: |
60 | previews: | 60 | 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) { | |||
710 | STATIC_MAX_AGE.SERVER = '0' | 710 | STATIC_MAX_AGE.SERVER = '0' |
711 | 711 | ||
712 | ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2 | 712 | ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2 |
713 | ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 100 * 10000 // 10 seconds | 713 | ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds |
714 | ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 100 * 10000 // 10 seconds | 714 | ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 10 * 1000 // 10 seconds |
715 | ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 100 * 10000 // 10 seconds | 715 | ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 10 * 1000 // 10 seconds |
716 | 716 | ||
717 | CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB | 717 | CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB |
718 | 718 | ||
@@ -924,7 +924,6 @@ function updateWebserverUrls () { | |||
924 | WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME | 924 | WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME |
925 | WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME | 925 | WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME |
926 | WEBSERVER.PORT = CONFIG.WEBSERVER.PORT | 926 | WEBSERVER.PORT = CONFIG.WEBSERVER.PORT |
927 | WEBSERVER.PORT = CONFIG.WEBSERVER.PORT | ||
928 | 927 | ||
929 | WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH | 928 | WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH |
930 | } | 929 | } |