From: Chocobozzz <me@florianbigard.com>
Date: Tue, 11 Jun 2019 08:50:16 +0000 (+0200)
Subject: Fix email object/body configurations
X-Git-Tag: v1.4.0-rc.1~172
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dd2c2a52ccd07bcb2317dcc6ce45a2291e6bad62;p=oweals%2Fpeertube.git

Fix email object/body configurations
---

diff --git a/config/production.yaml.example b/config/production.yaml.example
index c025426bb..bd0d956bd 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -54,6 +54,12 @@ smtp:
   ca_file: null # Used for self signed certificates
   from_address: 'admin@example.com'
 
+email:
+  body:
+    signature: "PeerTube"
+  object:
+    prefix: "[PeerTube]"
+
 # From the project root directory
 storage:
   tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing...
@@ -248,8 +254,6 @@ instance:
     "# If you would like to report a security issue\n# you may report it to:\nContact: https://github.com/Chocobozzz/PeerTube/blob/develop/SECURITY.md\nContact: mailto:"
 
 services:
-  # You can provide a reporting endpoint for Content Security Policy violations
-  csp-logger:
   # Cards configuration to format video in Twitter
   twitter:
     username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts
index 622ad7d6b..c211d725c 100644
--- a/server/initializers/checker-before-init.ts
+++ b/server/initializers/checker-before-init.ts
@@ -10,6 +10,7 @@ function checkMissedConfig () {
     'trust_proxy',
     'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max',
     'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address',
+    'email.body.signature', 'email.object.prefix',
     'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache',
     'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists',
     'log.level',