From fd20237673aac2a134246e2c22107069c6e16a13 Mon Sep 17 00:00:00 2001 From: Haw Loeung Date: Tue, 22 Mar 2022 10:58:40 +1100 Subject: [PATCH] Update email address used for emails @canonical.com is now DKIM signed and SPF published which means emails from proposed-migration running on snakefruit sending direct would likely be caught out. Since we're here, the project is Ubuntu related so switch to using an @ubuntu.com address instead. --- britney2/policies/email.py | 4 ++-- britney2/policies/sruadtregression.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/britney2/policies/email.py b/britney2/policies/email.py index f500a79..c6fe571 100644 --- a/britney2/policies/email.py +++ b/britney2/policies/email.py @@ -28,7 +28,7 @@ BOTS = { USER + "katie", } -MESSAGE = """From: Ubuntu Release Team +MESSAGE = """From: Ubuntu Release Team To: {recipients} X-Proposed-Migration: notice Subject: [proposed-migration] {source_name} {version} stuck in {series}-proposed for {age} day{plural}. @@ -287,7 +287,7 @@ class EmailPolicy(BasePolicy, Rest): ) ) server = smtplib.SMTP(self.email_host) - server.sendmail("noreply@canonical.com", emails, msg) + server.sendmail("noreply+proposed-migration@ubuntu.com", emails, msg) server.quit() # record the age at which the mail should have been sent last_sent = last_due diff --git a/britney2/policies/sruadtregression.py b/britney2/policies/sruadtregression.py index 1c8ac82..6fa8985 100644 --- a/britney2/policies/sruadtregression.py +++ b/britney2/policies/sruadtregression.py @@ -171,7 +171,7 @@ class SRUADTRegressionPolicy(BasePolicy, Rest): bug_mail = "%s@bugs.launchpad.net" % bug server = smtplib.SMTP(self.email_host) server.sendmail( - "noreply@canonical.com", + "noreply+proposed-migration@ubuntu.com", bug_mail, MESSAGE.format(**locals()), )