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

[Thomas Cuthbert]

General fixes based on a redeploy on staging

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Tom Haddon (mthaddon)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision a2f989f07ae67ecba2db045c8b519bfb64347448

diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 1eddf2a..338ef5f 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -110,14 +110,14 @@ def configure_postfix():
 def configure_spamassassin():
     config = hookenv.config()
     default_config = ('ENABLED=0\n'
-                      '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'
+                      'OPTIONS="--create-prefs --max-children 5 --username spamd --helper-home-dir /var/lib/spamd -s /var/log/spamd.log"\n'
                       'CRON=1\n')
     sa_policy = config["spamassassin_policy"]
     render(source="sa-local.cf.tmpl",
            target="/etc/spamassassin/local.cf",
-           owner="spamd",
-           group="spamd",
-           perms=0o640,
+           owner="root",
+           group="root",
+           perms=0o444,
            context={'policy': sa_policy})
 
     host.write_file("/etc/default/spamassassin", default_config)