Merge ~tcuthbert/mailman3-core-charm:mail-filtering into mailman3-core-charm:master

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Tom Haddon
Approved revision: 5b3eb98710893aca948e96d3fbfb1ae34d1e2ad1
Merged at revision: a2f989f07ae67ecba2db045c8b519bfb64347448
Proposed branch: ~tcuthbert/mailman3-core-charm:mail-filtering
Merge into: mailman3-core-charm:master
Diff against target: 23 lines (+4/-4)
1 file modified
reactive/mailman3_core.py (+4/-4)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+350434@code.launchpad.net

Commit message

General fixes based on a redeploy on staging

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision a2f989f07ae67ecba2db045c8b519bfb64347448

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
2index 1eddf2a..338ef5f 100644
3--- a/reactive/mailman3_core.py
4+++ b/reactive/mailman3_core.py
5@@ -110,14 +110,14 @@ def configure_postfix():
6 def configure_spamassassin():
7 config = hookenv.config()
8 default_config = ('ENABLED=0\n'
9- 'OPTIONS="--create-prefs --max-children 5 --pidfile=/var/run/spamassassin.pid --username spamd --helper-home-dir /var/lib/spamd -s /var/log/spamd.log"\n'
10+ 'OPTIONS="--create-prefs --max-children 5 --username spamd --helper-home-dir /var/lib/spamd -s /var/log/spamd.log"\n'
11 'CRON=1\n')
12 sa_policy = config["spamassassin_policy"]
13 render(source="sa-local.cf.tmpl",
14 target="/etc/spamassassin/local.cf",
15- owner="spamd",
16- group="spamd",
17- perms=0o640,
18+ owner="root",
19+ group="root",
20+ perms=0o444,
21 context={'policy': sa_policy})
22
23 host.write_file("/etc/default/spamassassin", default_config)

Subscribers

People subscribed via source and target branches