launchpad-reviewers team mailing list archive

[Colin Watson <mp+449340@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-cron-mailfrom into launchpad:master.

Commit message:
charm: Set MAILFROM in crontabs

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449340

Otherwise I believe that the mail relays reject cron mail before it gets to the error-reports list.

I also set `TZ=UTC` in a couple of crontabs that lacked it, which might be unnecessary but doesn't hurt and is good for consistency.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-cron-mailfrom into launchpad:master.

diff --git a/charm/launchpad-admin/templates/crontab.j2 b/charm/launchpad-admin/templates/crontab.j2
index f16afaf..62bafc4 100644
--- a/charm/launchpad-admin/templates/crontab.j2
+++ b/charm/launchpad-admin/templates/crontab.j2
@@ -1,4 +1,5 @@
 TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 
 # Kill connections idling in a transaction for too long.
diff --git a/charm/launchpad-appserver/templates/crontab.j2 b/charm/launchpad-appserver/templates/crontab.j2
index e0a7a06..e00877b 100644
--- a/charm/launchpad-appserver/templates/crontab.j2
+++ b/charm/launchpad-appserver/templates/crontab.j2
@@ -1,4 +1,5 @@
 TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 
 # Catch up with publishing OOPSes that were temporarily spooled to disk due
diff --git a/charm/launchpad-buildd-manager/templates/crontab.j2 b/charm/launchpad-buildd-manager/templates/crontab.j2
index 435cf43..5c331c6 100644
--- a/charm/launchpad-buildd-manager/templates/crontab.j2
+++ b/charm/launchpad-buildd-manager/templates/crontab.j2
@@ -1,4 +1,5 @@
 TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 LPCONFIG=launchpad-buildd-manager
 
diff --git a/charm/launchpad-ftpmaster-publisher/templates/crontab.j2 b/charm/launchpad-ftpmaster-publisher/templates/crontab.j2
index e55815f..87b4237 100644
--- a/charm/launchpad-ftpmaster-publisher/templates/crontab.j2
+++ b/charm/launchpad-ftpmaster-publisher/templates/crontab.j2
@@ -1,3 +1,5 @@
+TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 LPCONFIG=launchpad-ftpmaster-publisher
 
diff --git a/charm/launchpad-ftpmaster-uploader/templates/crontab.j2 b/charm/launchpad-ftpmaster-uploader/templates/crontab.j2
index 94942b9..ebf89ae 100644
--- a/charm/launchpad-ftpmaster-uploader/templates/crontab.j2
+++ b/charm/launchpad-ftpmaster-uploader/templates/crontab.j2
@@ -1,3 +1,5 @@
+TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 LPCONFIG=launchpad-ftpmaster-uploader
 
diff --git a/charm/launchpad-librarian/templates/crontab.j2 b/charm/launchpad-librarian/templates/crontab.j2
index a545a63..c12e7b0 100644
--- a/charm/launchpad-librarian/templates/crontab.j2
+++ b/charm/launchpad-librarian/templates/crontab.j2
@@ -1,4 +1,5 @@
 TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 LPCONFIG=launchpad-librarian1
 
diff --git a/charm/launchpad-scripts-bzrsyncd/templates/crontab.j2 b/charm/launchpad-scripts-bzrsyncd/templates/crontab.j2
index 6b12e34..d0a3656 100644
--- a/charm/launchpad-scripts-bzrsyncd/templates/crontab.j2
+++ b/charm/launchpad-scripts-bzrsyncd/templates/crontab.j2
@@ -1,4 +1,5 @@
 TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 LPCONFIG=launchpad-scripts-bzrsyncd
 
diff --git a/charm/launchpad-scripts/templates/crontab.j2 b/charm/launchpad-scripts/templates/crontab.j2
index 5292436..499bc0a 100644
--- a/charm/launchpad-scripts/templates/crontab.j2
+++ b/charm/launchpad-scripts/templates/crontab.j2
@@ -1,4 +1,5 @@
 TZ=UTC
+MAILFROM={{ bounce_address }}
 MAILTO={{ cron_mailto }}
 LPCONFIG=launchpad-scripts