Skip to content

add missing SMTP_FROM in docker-comopse yml file #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lmarini merged 5 commits into from
Sep 11, 2023
Merged

add missing SMTP_FROM in docker-comopse yml file #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f8544f
add missing SMTP_FROM in docker-comopse yml file
bingzhang Aug 25, 2023
8147eee
add smtp.from in custom.conf
bingzhang Sep 8, 2023
54328fe
add default smtp.from in custom.conf
bingzhang Sep 8, 2023
6b7dd26
Merge branch 'develop' into 417-task-add-smtp_from-for-clowder-servic…
lmarini Sep 11, 2023
5b5390f
Merge branch 'develop' into 417-task-add-smtp_from-for-clowder-servic…
lmarini Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Extractors can now specify an extractor_key and an owner (email address) when sending a
registration or heartbeat to Clowder that will restrict use of that extractor to them.
- 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)
- Add SMTP_FROM in docker-compose yml file. [#417](https://github.com/clowder-framework/clowder/issues/417)
- Keycloak provider with secure social [#419](https://github.com/clowder-framework/clowder/issues/419)
- Documentation on how to do easy testing of pull requests

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ services:
- RABBITMQ_CLOWDERURL=${RABBITMQ_CLOWDERURL:-http://clowder:9000}
- SMTP_MOCK=${SMTP_MOCK:-true}
- SMTP_SERVER=${SMTP_SERVER:-smtp}
- SMTP_FROM=${SMTP_FROM:-devnull@ncsa.illinois.edu}
- CLOWDER_STORAGE=${CLOWDER_STORAGE:-services.filesystem.DiskByteStorageService}
- CLOWDER_DISKPATH=${CLOWDER_DISKPATH:-/home/clowder/data}
- S3_ENDPOINT=${S3_ENDPOINT:-http://minio:9000}
Expand Down
2 changes: 2 additions & 0 deletions docker/custom.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ smtp.mock=true
smtp.mock=${?SMTP_MOCK}
smtp.host="smtp"
smtp.host=${?SMTP_SERVER}
smtp.from="devnull@ncsa.illinois.edu"
smtp.from=${?SMTP_FROM}

# storage
service.byteStorage=services.filesystem.DiskByteStorageService
Expand Down