Merge branch 'release/v1.2.0'

[oweals/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 38e1941d8e6dda3a7bccbd8eb210c2382bc2cbe0..f4245ed4db308f44351e0d4f647ccaeb67f51b00 100644 (file)
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,8 +1,8 @@
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
-import { CONFIG } from '../../../server/initializers'
 
 export interface ServerConfig {
   serverVersion: string
+  serverCommit?: string
 
   instance: {
     name: string
@@ -15,9 +15,18 @@ export interface ServerConfig {
     }
   }
 
+  email: {
+    enabled: boolean
+  }
+
+  contactForm: {
+    enabled: boolean
+  }
+
   signup: {
     allowed: boolean,
-    allowedForCurrentIP: boolean
+    allowedForCurrentIP: boolean,
+    requiresEmailVerification: boolean
   }
 
   transcoding: {
@@ -25,10 +34,13 @@ export interface ServerConfig {
   }
 
   import: {
-    video: {
+    videos: {
       http: {
         enabled: boolean
       }
+      torrent: {
+        enabled: boolean
+      }
     }
   }
 
@@ -64,5 +76,12 @@ export interface ServerConfig {
 
   user: {
     videoQuota: number
+    videoQuotaDaily: number
+  }
+
+  trending: {
+    videos: {
+      intervalDays: number
+    }
   }
 }