diff --git a/changes/1927-email-template-images b/changes/1927-email-template-images new file mode 100644 index 000000000..129fbce9b --- /dev/null +++ b/changes/1927-email-template-images @@ -0,0 +1 @@ +* Move email template images from github to fleetdm.com; update links diff --git a/server/mail/templates/change_email_confirmation.html b/server/mail/templates/change_email_confirmation.html index 7a77d93e4..8cafae318 100644 --- a/server/mail/templates/change_email_confirmation.html +++ b/server/mail/templates/change_email_confirmation.html @@ -93,7 +93,7 @@ Fleet logo @@ -140,14 +140,14 @@ Fleet logo Twitter logo diff --git a/server/mail/templates/invite_token.html b/server/mail/templates/invite_token.html index 5dd7b45f7..76ac94e27 100644 --- a/server/mail/templates/invite_token.html +++ b/server/mail/templates/invite_token.html @@ -93,7 +93,7 @@ Fleet logo @@ -170,14 +170,14 @@ Fleet logo Twitter logo diff --git a/server/mail/templates/password_reset.html b/server/mail/templates/password_reset.html index da5716d21..7c0a97358 100644 --- a/server/mail/templates/password_reset.html +++ b/server/mail/templates/password_reset.html @@ -93,7 +93,7 @@ Fleet logo @@ -145,14 +145,14 @@ Fleet logo Twitter logo diff --git a/server/mail/templates/smtp_setup.html b/server/mail/templates/smtp_setup.html index 3832c7439..71fd94af5 100644 --- a/server/mail/templates/smtp_setup.html +++ b/server/mail/templates/smtp_setup.html @@ -89,7 +89,7 @@ Fleet logo @@ -119,14 +119,14 @@ Fleet logo Twitter logo diff --git a/server/service/service.go b/server/service/service.go index 9819224ed..e9cf216b8 100644 --- a/server/service/service.go +++ b/server/service/service.go @@ -4,7 +4,6 @@ package service import ( "html/template" - "strings" "sync" "github.com/WatchBeam/clock" @@ -14,7 +13,6 @@ import ( "github.com/fleetdm/fleet/v4/server/logging" "github.com/fleetdm/fleet/v4/server/sso" kitlog "github.com/go-kit/kit/log" - "github.com/kolide/kit/version" "github.com/pkg/errors" ) @@ -80,17 +78,9 @@ type validationMiddleware struct { ssoSessionStore sso.SessionStore } -// getAssetURL gets the URL prefix used for retrieving assets from Github. This -// function will determine the appropriate version to use, and create a URL -// prefix for retrieving assets from that tag. +// getAssetURL simply returns the base url used for retrieving image assets from fleetdm.com. func getAssetURL() template.URL { - v := version.Version().Version - tag := strings.Split(v, "-")[0] - if tag == "unknown" { - tag = "main" - } - - return template.URL("https://github.com/fleetdm/fleet/blob/" + tag) + return template.URL("https://fleetdm.com/images/permanent") } // seenHostSet implements synchronized storage for the set of seen hosts. diff --git a/website/assets/images/permanent/fleet-logo-blue-118x41@2x.png b/website/assets/images/permanent/fleet-logo-blue-118x41@2x.png new file mode 100644 index 000000000..d9ae53a2b Binary files /dev/null and b/website/assets/images/permanent/fleet-logo-blue-118x41@2x.png differ diff --git a/website/assets/images/permanent/fleet-mark-color-40x40@2x.png b/website/assets/images/permanent/fleet-mark-color-40x40@2x.png new file mode 100644 index 000000000..fe875ef11 Binary files /dev/null and b/website/assets/images/permanent/fleet-mark-color-40x40@2x.png differ diff --git a/website/assets/images/permanent/slack-logo-41x40@2x.png b/website/assets/images/permanent/slack-logo-41x40@2x.png new file mode 100644 index 000000000..76dd5411d Binary files /dev/null and b/website/assets/images/permanent/slack-logo-41x40@2x.png differ diff --git a/website/assets/images/permanent/twitter-logo-50x40@2x.png b/website/assets/images/permanent/twitter-logo-50x40@2x.png new file mode 100644 index 000000000..f8f5acf86 Binary files /dev/null and b/website/assets/images/permanent/twitter-logo-50x40@2x.png differ