Merge branch 'release/v1.2.0'

[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 217d142cdc17a7f5cfd08d635654ca166b4c7c98..f4245ed4db308f44351e0d4f647ccaeb67f51b00 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
@@ -14,15 +15,35 @@ export interface ServerConfig {
     }
   }
 
+  email: {
+    enabled: boolean
+  }
+
+  contactForm: {
+    enabled: boolean
+  }
+
   signup: {
     allowed: boolean,
-    allowedForCurrentIP: boolean
+    allowedForCurrentIP: boolean,
+    requiresEmailVerification: boolean
   }
 
   transcoding: {
     enabledResolutions: number[]
   }
 
+  import: {
+    videos: {
+      http: {
+        enabled: boolean
+      }
+      torrent: {
+        enabled: boolean
+      }
+    }
+  }
+
   avatar: {
     file: {
       size: {
@@ -55,5 +76,12 @@ export interface ServerConfig {
 
   user: {
     videoQuota: number
+    videoQuotaDaily: number
+  }
+
+  trending: {
+    videos: {
+      intervalDays: number
+    }
   }
 }