Merge pull request #4998 from wkloucek/fix-notifications-ocis-url

add NOTIFICATIONS_WEB_UI_URL

changelog/unreleased/fix-notifications-web-ui-url.md

@@ -0,0 +1,7 @@
+Bugfix: Fix notifications Web UI url
+
+We've fixed the configuration of the notification service's Web UI url that appears in emails.
+
+Previously it was only configurable via the global "OCIS_URL" and is now also configurable via "NOTIFICATIONS_WEB_UI_URL".
+
+https://github.com/owncloud/ocis/pull/4998

services/notifications/pkg/command/server.go

@@ -91,7 +91,7 @@ func Server(cfg *config.Config) *cli.Command {
 				logger.Fatal().Err(err).Str("addr", cfg.Notifications.RevaGateway).Msg("could not get reva client")
 			}
 
-			svc := service.NewEventsNotifier(evts, channel, logger, gwclient, cfg.Notifications.MachineAuthAPIKey, cfg.Notifications.EmailTemplatePath, cfg.Commons.OcisURL)
+			svc := service.NewEventsNotifier(evts, channel, logger, gwclient, cfg.Notifications.MachineAuthAPIKey, cfg.Notifications.EmailTemplatePath, cfg.WebUIURL)
 			return svc.Run()
 		},
 	}

services/notifications/pkg/config/config.go

@@ -15,6 +15,8 @@ type Config struct {
 	Log   *Log  `yaml:"log"`
 	Debug Debug `yaml:"debug"`
 
+	WebUIURL string `yaml:"ocis_url" env:"OCIS_URL;NOTIFICATIONS_WEB_UI_URL" desc:"The public facing URL of the oCIS Web UI, used e.g. when sending notification eMails"`
+
 	Notifications Notifications `yaml:"notifications"`
 
 	Context context.Context `yaml:"-"`

services/notifications/pkg/config/defaults/defaultconfig.go

@@ -23,6 +23,7 @@ func DefaultConfig() *config.Config {
 		Service: config.Service{
 			Name: "notifications",
 		},
+		WebUIURL: "https://localhost:9200",
 		Notifications: config.Notifications{
 			SMTP: config.SMTP{
 				Host:           "",