Merge branch 'release/1.4.0' into develop

[github/Chocobozzz/PeerTube.git] / server / initializers / config.ts

diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 2c1b30021ed24c654a57541f5e65d821c0ee1d8a..510f7d64d34a2c5d24f7a5525dfe7b3c3fbc0c27 100644 (file)
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -48,8 +48,8 @@ const CONFIG = {
     BODY: {
       SIGNATURE: config.get<string>('email.body.signature')
     },
-    OBJECT: {
-      PREFIX: config.get<string>('email.object.prefix') + ' '
+    SUBJECT: {
+      PREFIX: config.get<string>('email.subject.prefix') + ' '
     }
   },
   STORAGE: {
@@ -137,7 +137,8 @@ const CONFIG = {
   PLUGINS: {
     INDEX: {
       ENABLED: config.get<boolean>('plugins.index.enabled'),
-      URL: config.get<boolean>('plugins.index.url')
+      CHECK_LATEST_VERSIONS_INTERVAL: parseDurationToMs(config.get<string>('plugins.index.check_latest_versions_interval')),
+      URL: config.get<string>('plugins.index.url')
     }
   },
   ADMIN: {