aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-03 11:10:31 +0200
committerChocobozzz <me@florianbigard.com>2018-08-06 11:19:16 +0200
commit5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e (patch)
treedd992ea798c620b8bdb5bf5fd9b8f1b97d4410f2 /shared
parent7e5f9f001d5de22c54748f935edc0c069028bb0e (diff)
downloadPeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.tar.gz
PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.tar.zst
PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.zip
Add import http enabled configuration
Diffstat (limited to 'shared')
-rw-r--r--shared/models/server/custom-config.model.ts8
-rw-r--r--shared/models/server/server-config.model.ts9
2 files changed, 17 insertions, 0 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 9c4718e43..46320435d 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -55,4 +55,12 @@ export interface CustomConfig {
55 '1080p': boolean 55 '1080p': boolean
56 } 56 }
57 } 57 }
58
59 import: {
60 videos: {
61 http: {
62 enabled: boolean
63 }
64 }
65 }
58} 66}
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 217d142cd..38e1941d8 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,4 +1,5 @@
1import { NSFWPolicyType } from '../videos/nsfw-policy.type' 1import { NSFWPolicyType } from '../videos/nsfw-policy.type'
2import { CONFIG } from '../../../server/initializers'
2 3
3export interface ServerConfig { 4export interface ServerConfig {
4 serverVersion: string 5 serverVersion: string
@@ -23,6 +24,14 @@ export interface ServerConfig {
23 enabledResolutions: number[] 24 enabledResolutions: number[]
24 } 25 }
25 26
27 import: {
28 video: {
29 http: {
30 enabled: boolean
31 }
32 }
33 }
34
26 avatar: { 35 avatar: {
27 file: { 36 file: {
28 size: { 37 size: {