Skip to content

Commit 8517d91

Browse files
bingzhanglmarini
andauthored
add missing SMTP_FROM in docker-comopse yml file (#418)
* add missing SMTP_FROM in docker-comopse yml file * add smtp.from in custom.conf * add default smtp.from in custom.conf --------- Co-authored-by: Luigi Marini <[email protected]>
1 parent 6a89ba8 commit 8517d91

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313
- Extractors can now specify an extractor_key and an owner (email address) when sending a
1414
registration or heartbeat to Clowder that will restrict use of that extractor to them.
1515
- Added a dropdown menu to select all spaces, your spaces and also the spaces you have access to. [#374](https://github.com/clowder-framework/clowder/issues/374)
16+
- Add SMTP_FROM in docker-compose yml file. [#417](https://github.com/clowder-framework/clowder/issues/417)
1617
- Keycloak provider with secure social [#419](https://github.com/clowder-framework/clowder/issues/419)
1718
- Documentation on how to do easy testing of pull requests
1819

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ services:
6767
- RABBITMQ_CLOWDERURL=${RABBITMQ_CLOWDERURL:-http://clowder:9000}
6868
- SMTP_MOCK=${SMTP_MOCK:-true}
6969
- SMTP_SERVER=${SMTP_SERVER:-smtp}
70+
- SMTP_FROM=${SMTP_FROM:[email protected]}
7071
- CLOWDER_STORAGE=${CLOWDER_STORAGE:-services.filesystem.DiskByteStorageService}
7172
- CLOWDER_DISKPATH=${CLOWDER_DISKPATH:-/home/clowder/data}
7273
- S3_ENDPOINT=${S3_ENDPOINT:-http://minio:9000}

docker/custom.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ smtp.mock=true
3232
smtp.mock=${?SMTP_MOCK}
3333
smtp.host="smtp"
3434
smtp.host=${?SMTP_SERVER}
35+
smtp.from="[email protected]"
36+
smtp.from=${?SMTP_FROM}
3537

3638
# storage
3739
service.byteStorage=services.filesystem.DiskByteStorageService

0 commit comments

Comments
 (0)