coder
diff --git a/‎agent/agentssh/agentssh.go
+2-2 b/‎agent/agentssh/agentssh.go
+2-2
diff --git a/‎coderd/apidoc/docs.go
+38-16 b/‎coderd/apidoc/docs.go
+38-16
diff --git a/‎coderd/apidoc/swagger.json
+38-16 b/‎coderd/apidoc/swagger.json
+38-16
diff --git a/‎coderd/database/dbauthz/dbauthz.go
+12 b/‎coderd/database/dbauthz/dbauthz.go
+12
diff --git a/‎coderd/database/dbmem/dbmem.go
+20 b/‎coderd/database/dbmem/dbmem.go
+20
diff --git a/‎coderd/database/dbmetrics/dbmetrics.go
+14 b/‎coderd/database/dbmetrics/dbmetrics.go
+14
diff --git a/‎coderd/database/dbmock/dbmock.go
+29 b/‎coderd/database/dbmock/dbmock.go
+29
diff --git a/‎coderd/database/querier.go
+2 b/‎coderd/database/querier.go
+2
diff --git a/‎coderd/database/queries.sql.go
+21 b/‎coderd/database/queries.sql.go
+21
diff --git a/‎coderd/database/queries/siteconfig.sql
+7 b/‎coderd/database/queries/siteconfig.sql
+7
@@ -63,7 +63,7 @@ type Config struct {
 	// file will be displayed to the user upon login.
 	MOTDFile func() string
 	// ServiceBanner returns the configuration for the Coder service banner.
-	ServiceBanner func() *codersdk.ServiceBannerConfig
+	ServiceBanner func() *codersdk.BannerConfig
 	// UpdateEnv updates the environment variables for the command to be
 	// executed. It can be used to add, modify or replace environment variables.
 	UpdateEnv func(current []string) (updated []string, err error)
@@ -124,7 +124,7 @@ func NewServer(ctx context.Context, logger slog.Logger, prometheusRegistry *prom
 		config.MOTDFile = func() string { return "" }
 	}
 	if config.ServiceBanner == nil {
-		config.ServiceBanner = func() *codersdk.ServiceBannerConfig { return &codersdk.ServiceBannerConfig{} }
+		config.ServiceBanner = func() *codersdk.BannerConfig { return &codersdk.BannerConfig{} }
 	}
 	if config.WorkingDirectory == nil {
 		config.WorkingDirectory = func() string {
 
@@ -1220,6 +1220,11 @@ func (q *querier) GetLogoURL(ctx context.Context) (string, error) {
 	return q.db.GetLogoURL(ctx)
 }
 
+func (q *querier) GetNotificationBanners(ctx context.Context) (string, error) {
+	// No authz checks
+	return q.db.GetServiceBanner(ctx)
+}
+
 func (q *querier) GetOAuth2ProviderAppByID(ctx context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
 	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceOAuth2ProviderApp); err != nil {
 		return database.OAuth2ProviderApp{}, err
@@ -3364,6 +3369,13 @@ func (q *querier) UpsertLogoURL(ctx context.Context, value string) error {
 	return q.db.UpsertLogoURL(ctx, value)
 }
 
+func (q *querier) UpsertNotificationBanners(ctx context.Context, value string) error {
+	if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
+		return err
+	}
+	return q.db.UpsertServiceBanner(ctx, value)
+}
+
 func (q *querier) UpsertOAuthSigningKey(ctx context.Context, value string) error {
 	if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
 		return err
 
@@ -186,6 +186,7 @@ type data struct {
 	derpMeshKey             string
 	lastUpdateCheck         []byte
 	serviceBanner           []byte
+	notificationBanners     []byte
 	healthSettings          []byte
 	applicationName         string
 	logoURL                 string
@@ -2488,6 +2489,17 @@ func (q *FakeQuerier) GetLogoURL(_ context.Context) (string, error) {
 	return q.logoURL, nil
 }
 
+func (q *FakeQuerier) GetNotificationBanners(_ context.Context) (string, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	if q.notificationBanners == nil {
+		return "", sql.ErrNoRows
+	}
+
+	return string(q.notificationBanners), nil
+}
+
 func (q *FakeQuerier) GetOAuth2ProviderAppByID(_ context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
@@ -8251,6 +8263,14 @@ func (q *FakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
 	return nil
 }
 
+func (q *FakeQuerier) UpsertNotificationBanners(_ context.Context, data string) error {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	q.notificationBanners = []byte(data)
+	return nil
+}
+
 func (q *FakeQuerier) UpsertOAuthSigningKey(_ context.Context, value string) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
@@ -43,6 +43,13 @@ ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'service_ban
 -- name: GetServiceBanner :one
 SELECT value FROM site_configs WHERE key = 'service_banner';
 
+-- name: UpsertNotificationBanners :exec
+INSERT INTO site_configs (key, value) VALUES ('notification_banners', $1)
+ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'notification_banners';
+
+-- name: GetNotificationBanners :one
+SELECT value FROM site_configs WHERE key = 'notification_banners';
+
 -- name: UpsertLogoURL :exec
 INSERT INTO site_configs (key, value) VALUES ('logo_url', $1)
 ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'logo_url';