diff options
author | Chocobozzz <me@florianbigard.com> | 2019-06-11 10:50:16 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-06-11 10:50:16 +0200 |
commit | dd2c2a52ccd07bcb2317dcc6ce45a2291e6bad62 (patch) | |
tree | 998c1e8e7c33c104ba3cfe894bf1b723f4ec61c7 | |
parent | 7c51916a61d53526c594a2115f1c0e6051a895d9 (diff) | |
download | PeerTube-dd2c2a52ccd07bcb2317dcc6ce45a2291e6bad62.tar.gz PeerTube-dd2c2a52ccd07bcb2317dcc6ce45a2291e6bad62.tar.zst PeerTube-dd2c2a52ccd07bcb2317dcc6ce45a2291e6bad62.zip |
Fix email object/body configurations
-rw-r--r-- | config/production.yaml.example | 8 | ||||
-rw-r--r-- | server/initializers/checker-before-init.ts | 1 |
2 files changed, 7 insertions, 2 deletions
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: | |||
54 | ca_file: null # Used for self signed certificates | 54 | ca_file: null # Used for self signed certificates |
55 | from_address: 'admin@example.com' | 55 | from_address: 'admin@example.com' |
56 | 56 | ||
57 | email: | ||
58 | body: | ||
59 | signature: "PeerTube" | ||
60 | object: | ||
61 | prefix: "[PeerTube]" | ||
62 | |||
57 | # From the project root directory | 63 | # From the project root directory |
58 | storage: | 64 | storage: |
59 | tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... | 65 | tmp: '/var/www/peertube/storage/tmp/' # Used to download data (imports etc), store uploaded files before processing... |
@@ -248,8 +254,6 @@ instance: | |||
248 | "# 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:" | 254 | "# 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:" |
249 | 255 | ||
250 | services: | 256 | services: |
251 | # You can provide a reporting endpoint for Content Security Policy violations | ||
252 | csp-logger: | ||
253 | # Cards configuration to format video in Twitter | 257 | # Cards configuration to format video in Twitter |
254 | twitter: | 258 | twitter: |
255 | username: '@Chocobozzz' # Indicates the Twitter account for the website or platform on which the content was published | 259 | 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 () { | |||
10 | 'trust_proxy', | 10 | 'trust_proxy', |
11 | 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', | 11 | 'database.hostname', 'database.port', 'database.suffix', 'database.username', 'database.password', 'database.pool.max', |
12 | 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', | 12 | 'smtp.hostname', 'smtp.port', 'smtp.username', 'smtp.password', 'smtp.tls', 'smtp.from_address', |
13 | 'email.body.signature', 'email.object.prefix', | ||
13 | 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', | 14 | 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', |
14 | 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', | 15 | 'storage.redundancy', 'storage.tmp', 'storage.streaming_playlists', |
15 | 'log.level', | 16 | 'log.level', |