diff --git a/api/http/handler/motd/motd.go b/api/http/handler/motd/motd.go index 53246fec1..9d4f18004 100644 --- a/api/http/handler/motd/motd.go +++ b/api/http/handler/motd/motd.go @@ -10,6 +10,7 @@ import ( ) type motdResponse struct { + Title string `json:"Title"` Message string `json:"Message"` Hash []byte `json:"Hash"` } @@ -22,6 +23,12 @@ func (handler *Handler) motd(w http.ResponseWriter, r *http.Request) { return } + title, err := client.Get(portainer.MessageOfTheDayTitleURL, 0) + if err != nil { + response.JSON(w, &motdResponse{Message: ""}) + return + } + hash := crypto.HashFromBytes(motd) - response.JSON(w, &motdResponse{Message: string(motd), Hash: hash}) + response.JSON(w, &motdResponse{Title: string(title), Message: string(motd), Hash: hash}) } diff --git a/api/portainer.go b/api/portainer.go index 42e2f5709..42bdce3eb 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -801,6 +801,8 @@ const ( AssetsServerURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com" // MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved MessageOfTheDayURL = AssetsServerURL + "/motd.html" + // MessageOfTheDayTitleURL represents the URL where Portainer MOTD title can be retrieved + MessageOfTheDayTitleURL = AssetsServerURL + "/motd-title.txt" // ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved ExtensionDefinitionsURL = AssetsServerURL + "/extensions-1.20.2.json" // PortainerAgentHeader represents the name of the header available in any agent response diff --git a/app/portainer/models/motd.js b/app/portainer/models/motd.js index 165317b31..e3157b5bb 100644 --- a/app/portainer/models/motd.js +++ b/app/portainer/models/motd.js @@ -1,4 +1,5 @@ function MotdViewModel(data) { + this.Title = data.Title; this.Message = data.Message; this.Hash = data.Hash; } diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html index b12d8e749..06eecd3e4 100644 --- a/app/portainer/views/home/home.html +++ b/app/portainer/views/home/home.html @@ -9,7 +9,7 @@