diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 50d0246..71a5735 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -246,6 +246,12 @@ func RegisterNotificationFlags(rootCmd *cobra.Command) { envString("WATCHTOWER_NOTIFICATION_EMAIL_FROM"), "Address to send notification emails from") + flags.StringP( + "notification-email-from-name", + "", + envString("WATCHTOWER_NOTIFICATION_EMAIL_FROM_NAME"), + "Name to send notification emails from") + flags.StringP( "notification-email-to", "", @@ -425,6 +431,7 @@ func SetDefaults() { viper.SetDefault("WATCHTOWER_TIMEOUT", time.Second*10) viper.SetDefault("WATCHTOWER_NOTIFICATIONS", []string{}) viper.SetDefault("WATCHTOWER_NOTIFICATIONS_LEVEL", "info") + viper.SetDefault("WATCHTOWER_NOTIFICATION_EMAIL_FROM", "Watchtower") viper.SetDefault("WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT", 25) viper.SetDefault("WATCHTOWER_NOTIFICATION_EMAIL_SUBJECTTAG", "") viper.SetDefault("WATCHTOWER_NOTIFICATION_SLACK_IDENTIFIER", "watchtower") diff --git a/pkg/notifications/email.go b/pkg/notifications/email.go index 6c41968..40a6ca9 100644 --- a/pkg/notifications/email.go +++ b/pkg/notifications/email.go @@ -15,7 +15,7 @@ const ( ) type emailTypeNotifier struct { - From, To string + From, FromName, To string Server, User, Password string Port int tlsSkipVerify bool @@ -27,6 +27,7 @@ func newEmailNotifier(c *cobra.Command) t.ConvertibleNotifier { flags := c.Flags() from, _ := flags.GetString("notification-email-from") + fromName, _ := flags.GetString("notification-email-from-name") to, _ := flags.GetString("notification-email-to") server, _ := flags.GetString("notification-email-server") user, _ := flags.GetString("notification-email-server-user") @@ -38,6 +39,7 @@ func newEmailNotifier(c *cobra.Command) t.ConvertibleNotifier { n := &emailTypeNotifier{ entries: []*log.Entry{}, From: from, + FromName: fromName, To: to, Server: server, User: user, @@ -53,7 +55,7 @@ func newEmailNotifier(c *cobra.Command) t.ConvertibleNotifier { func (e *emailTypeNotifier) GetURL(c *cobra.Command) (string, error) { conf := &shoutrrrSmtp.Config{ FromAddress: e.From, - FromName: "Watchtower", + FromName: e.FromName, ToAddresses: []string{e.To}, Port: uint16(e.Port), Host: e.Server,