From 0f8544fb42804140234a2bcd3734c1b482b974ec Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Fri, 25 Aug 2023 11:13:41 -0500 Subject: [PATCH 1/3] add missing SMTP_FROM in docker-comopse yml file --- CHANGELOG.md | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a201097e2..b49a5a5f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) ## Fixed - Updated lastModifiesDate when updating file or metadata to a dataset, added lastModified to UI [386](https://github.com/clowder-framework/clowder/issues/386) diff --git a/docker-compose.yml b/docker-compose.yml index 45b90a271..1e9f05fcb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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} From 8147eee5cdc8bfe162d3447ff60c0c9a98d56abc Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Fri, 8 Sep 2023 09:09:54 -0500 Subject: [PATCH 2/3] add smtp.from in custom.conf --- docker/custom.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/custom.conf b/docker/custom.conf index a7f02f2f1..018ef3dbd 100644 --- a/docker/custom.conf +++ b/docker/custom.conf @@ -32,6 +32,7 @@ smtp.mock=true smtp.mock=${?SMTP_MOCK} smtp.host="smtp" smtp.host=${?SMTP_SERVER} +smtp.from=${?SMTP_FROM} # storage service.byteStorage=services.filesystem.DiskByteStorageService From 54328fec94846d6d9abd47530811bc879d5ce42a Mon Sep 17 00:00:00 2001 From: Bing Zhang Date: Fri, 8 Sep 2023 09:13:10 -0500 Subject: [PATCH 3/3] add default smtp.from in custom.conf --- docker/custom.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/custom.conf b/docker/custom.conf index 018ef3dbd..52f1fb090 100644 --- a/docker/custom.conf +++ b/docker/custom.conf @@ -32,6 +32,7 @@ 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