Merge branch 'release/v1.0.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / server / server-config.model.ts

diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index d1f9561637b637818f73c13f5d2fd794e70eecd7..91196c1eb818adcba88a4ef959e65443bf7d94c1 100644 (file)
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -2,6 +2,7 @@ import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 
 export interface ServerConfig {
   serverVersion: string
+  serverCommit?: string
 
   instance: {
     name: string
@@ -15,13 +16,26 @@ export interface ServerConfig {
   }
 
   signup: {
-    allowed: boolean
+    allowed: boolean,
+    allowedForCurrentIP: boolean,
+    requiresEmailVerification: boolean
   }
 
   transcoding: {
     enabledResolutions: number[]
   }
 
+  import: {
+    videos: {
+      http: {
+        enabled: boolean
+      }
+      torrent: {
+        enabled: boolean
+      }
+    }
+  }
+
   avatar: {
     file: {
       size: {
@@ -43,7 +57,17 @@ export interface ServerConfig {
     }
   }
 
+  videoCaption: {
+    file: {
+      size: {
+        max: number
+      },
+      extensions: string[]
+    }
+  }
+
   user: {
     videoQuota: number
+    videoQuotaDaily: number
   }
 }