aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/config.ts13
-rw-r--r--server/initializers/constants.ts7
2 files changed, 15 insertions, 5 deletions
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 3a7c72a1c..e20efe02c 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -69,6 +69,7 @@ const CONFIG = {
69 69
70 STORAGE: { 70 STORAGE: {
71 TMP_DIR: buildPath(config.get<string>('storage.tmp')), 71 TMP_DIR: buildPath(config.get<string>('storage.tmp')),
72 BIN_DIR: buildPath(config.get<string>('storage.bin')),
72 ACTOR_IMAGES: buildPath(config.get<string>('storage.avatars')), 73 ACTOR_IMAGES: buildPath(config.get<string>('storage.avatars')),
73 LOG_DIR: buildPath(config.get<string>('storage.logs')), 74 LOG_DIR: buildPath(config.get<string>('storage.logs')),
74 VIDEOS_DIR: buildPath(config.get<string>('storage.videos')), 75 VIDEOS_DIR: buildPath(config.get<string>('storage.videos')),
@@ -292,11 +293,13 @@ const CONFIG = {
292 293
293 HTTP: { 294 HTTP: {
294 get ENABLED () { return config.get<boolean>('import.videos.http.enabled') }, 295 get ENABLED () { return config.get<boolean>('import.videos.http.enabled') },
295 get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') }, 296
296 PROXY: { 297 YOUTUBE_DL_RELEASE: {
297 get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') }, 298 get URL () { return config.get<string>('import.videos.http.youtube_dl_release.url') },
298 get URL () { return config.get<string>('import.videos.http.proxy.url') } 299 get NAME () { return config.get<string>('import.videos.http.youtube_dl_release.name') }
299 } 300 },
301
302 get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') }
300 }, 303 },
301 TORRENT: { 304 TORRENT: {
302 get ENABLED () { return config.get<boolean>('import.videos.torrent.enabled') } 305 get ENABLED () { return config.get<boolean>('import.videos.torrent.enabled') }
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index dcbad9264..1d434d5ab 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -497,6 +497,12 @@ const MIMETYPES = {
497MIMETYPES.AUDIO.EXT_MIMETYPE = invert(MIMETYPES.AUDIO.MIMETYPE_EXT) 497MIMETYPES.AUDIO.EXT_MIMETYPE = invert(MIMETYPES.AUDIO.MIMETYPE_EXT)
498MIMETYPES.IMAGE.EXT_MIMETYPE = invert(MIMETYPES.IMAGE.MIMETYPE_EXT) 498MIMETYPES.IMAGE.EXT_MIMETYPE = invert(MIMETYPES.IMAGE.MIMETYPE_EXT)
499 499
500const BINARY_CONTENT_TYPES = new Set([
501 'binary/octet-stream',
502 'application/octet-stream',
503 'application/x-binary'
504])
505
500// --------------------------------------------------------------------------- 506// ---------------------------------------------------------------------------
501 507
502const OVERVIEWS = { 508const OVERVIEWS = {
@@ -903,6 +909,7 @@ export {
903 MIMETYPES, 909 MIMETYPES,
904 CRAWL_REQUEST_CONCURRENCY, 910 CRAWL_REQUEST_CONCURRENCY,
905 DEFAULT_AUDIO_RESOLUTION, 911 DEFAULT_AUDIO_RESOLUTION,
912 BINARY_CONTENT_TYPES,
906 JOB_COMPLETED_LIFETIME, 913 JOB_COMPLETED_LIFETIME,
907 HTTP_SIGNATURE, 914 HTTP_SIGNATURE,
908 VIDEO_IMPORT_STATES, 915 VIDEO_IMPORT_STATES,