From 0d78b2bd6535b6c905b4966f6f2bb67cf57b9971 Mon Sep 17 00:00:00 2001 From: avallete Date: Fri, 22 Nov 2024 15:59:52 +0100 Subject: [PATCH 1/2] feat(config): allow custom admin and sendername for inbucket --- internal/start/start.go | 3 ++- pkg/config/config.go | 16 ++++++++++------ pkg/config/templates/config.toml | 2 ++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/internal/start/start.go b/internal/start/start.go index bdb0989aa..8342a18b1 100644 --- a/internal/start/start.go +++ b/internal/start/start.go @@ -532,7 +532,8 @@ EOF env = append(env, "GOTRUE_SMTP_HOST="+utils.InbucketId, "GOTRUE_SMTP_PORT=2500", - "GOTRUE_SMTP_ADMIN_EMAIL=admin@email.com", + fmt.Sprintf("GOTRUE_SMTP_ADMIN_EMAIL=%s", utils.Config.Inbucket.AdminEmail), + fmt.Sprintf("GOTRUE_SMTP_SENDER_NAME=%s", utils.Config.Inbucket.SenderName), ) } diff --git a/pkg/config/config.go b/pkg/config/config.go index b1e7ed570..ba2151e24 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -159,11 +159,13 @@ type ( } inbucket struct { - Enabled bool `toml:"enabled"` - Image string `toml:"-"` - Port uint16 `toml:"port"` - SmtpPort uint16 `toml:"smtp_port"` - Pop3Port uint16 `toml:"pop3_port"` + Enabled bool `toml:"enabled"` + Image string `toml:"-"` + Port uint16 `toml:"port"` + SmtpPort uint16 `toml:"smtp_port"` + Pop3Port uint16 `toml:"pop3_port"` + AdminEmail string `toml:"admin_email"` + SenderName string `toml:"sender_name"` } edgeRuntime struct { @@ -327,7 +329,9 @@ func NewConfig(editors ...ConfigEditor) config { JwtSecret: defaultJwtSecret, }, Inbucket: inbucket{ - Image: inbucketImage, + Image: inbucketImage, + AdminEmail: "admin@email.com", + SenderName: "Admin", }, Studio: studio{ Image: studioImage, diff --git a/pkg/config/templates/config.toml b/pkg/config/templates/config.toml index 979e4bdfd..530bb3709 100644 --- a/pkg/config/templates/config.toml +++ b/pkg/config/templates/config.toml @@ -72,6 +72,8 @@ port = 54324 # Uncomment to expose additional ports for testing user applications that send emails. # smtp_port = 54325 # pop3_port = 54326 +# admin_email = "admin_inbucket@email.com" +# sender_name = "Admin Inbucket" [storage] enabled = true From 840b56948c004b7df805f5ec1850d220a2019846 Mon Sep 17 00:00:00 2001 From: Andrew Valleteau Date: Mon, 25 Nov 2024 12:19:49 +0100 Subject: [PATCH 2/2] Update pkg/config/templates/config.toml Co-authored-by: Han Qiao --- pkg/config/templates/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/config/templates/config.toml b/pkg/config/templates/config.toml index 530bb3709..cc674d59b 100644 --- a/pkg/config/templates/config.toml +++ b/pkg/config/templates/config.toml @@ -72,8 +72,8 @@ port = 54324 # Uncomment to expose additional ports for testing user applications that send emails. # smtp_port = 54325 # pop3_port = 54326 -# admin_email = "admin_inbucket@email.com" -# sender_name = "Admin Inbucket" +# admin_email = "admin@email.com" +# sender_name = "Admin" [storage] enabled = true