forks/peertube
1
0
Fork 0
Code Releases Activity

Revert some mistakes

Browse source
This commit is contained in:
Chocobozzz 2020-11-06 15:14:48 +01:00 committed by Chocobozzz
parent 9e2b2e76ba
commit 529f037294
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
config/test.yaml
View file

@ -37,24 +37,24 @@ log:
contact_form: contact_form:
enabled: true enabled: true
#
#redundancy: redundancy:
# videos: videos:
# check_interval: '1 minute' check_interval: '1 minute'
# strategies: strategies:
# - -
# size: '1000MB' size: '1000MB'
# min_lifetime: '10 minutes' min_lifetime: '10 minutes'
# strategy: 'most-views' strategy: 'most-views'
# - -
# size: '1000MB' size: '1000MB'
# min_lifetime: '10 minutes' min_lifetime: '10 minutes'
# strategy: 'trending' strategy: 'trending'
# - -
# size: '1000MB' size: '1000MB'
# min_lifetime: '10 minutes' min_lifetime: '10 minutes'
# strategy: 'recently-added' strategy: 'recently-added'
# min_views: 1 min_views: 1
cache: cache:
previews: previews:

7
server/initializers/constants.ts
View file

@ -710,9 +710,9 @@ if (isTestInstance() === true) {
STATIC_MAX_AGE.SERVER = '0' STATIC_MAX_AGE.SERVER = '0'
ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2 ACTIVITY_PUB.COLLECTION_ITEMS_PER_PAGE = 2
ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 100 * 10000 // 10 seconds ACTIVITY_PUB.ACTOR_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 100 * 10000 // 10 seconds ACTIVITY_PUB.VIDEO_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 100 * 10000 // 10 seconds ACTIVITY_PUB.VIDEO_PLAYLIST_REFRESH_INTERVAL = 10 * 1000 // 10 seconds
CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB CONSTRAINTS_FIELDS.ACTORS.AVATAR.FILE_SIZE.max = 100 * 1024 // 100KB
@ -924,7 +924,6 @@ function updateWebserverUrls () {
WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME WEBSERVER.SCHEME = CONFIG.WEBSERVER.SCHEME
WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME WEBSERVER.HOSTNAME = CONFIG.WEBSERVER.HOSTNAME
WEBSERVER.PORT = CONFIG.WEBSERVER.PORT 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 WEBSERVER.RTMP_URL = 'rtmp://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.LIVE.RTMP.PORT + '/' + VIDEO_LIVE.RTMP.BASE_PATH
} }