Merge ~kotodama/mailman3-core-charm/+git/mailman3-core-charm:sa-update-http-proxy into mailman3-core-charm:master

[Loïc Gomez]

Add sa_http_proxy option to allow sa-update cronjob to run through a proxy.

[Romain Couturat (romaincout)]

lgtm

review: Approve

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

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

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

Change successfully merged at revision 50182b0cf8b38c29c764b2510ad8ec1f523357fe

diff --git a/config.yaml b/config.yaml
index 61aefd4..a2ebd27 100644
--- a/config.yaml
+++ b/config.yaml
@@ -35,6 +35,16 @@ options:
     type: boolean
     description: |
       Enable Spamassassin mail filter
+  sa_http_proxy:
+    default: ""
+    type: string
+    description: |
+      Define a http(s) proxy in /etc/default/spamassassin
+
+      This will add http_proxy and https_proxy environment variables in Spamassassin's /etc/default file
+      and allow sa-update cronjob to update rulesets though a http(s)_proxy.
+
+      A valid entry would be http://proxy.host.name:3128
   enable_spf:
     default: true
     type: boolean
diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index 081cdcb..dec185c 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -158,6 +158,10 @@ def configure_spamassassin():
     default_config = ('ENABLED=0\n'
                       'OPTIONS="--create-prefs --max-children 5 --username spamd --helper-home-dir /var/lib/spamd -s /var/log/spamd.log"\n'
                       'CRON=1\n')
+    if config["sa_http_proxy"]:
+        default_config += 'http_proxy="' + config["sa_http_proxy"] + '"\n'
+        default_config += 'https_proxy="' + config["sa_http_proxy"] + '"\n'
+
     sa_policy = config["spamassassin_policy"]
     render(source="sa-local.cf.tmpl",
            target="/etc/spamassassin/local.cf",