From 968796fe1753abfd6a4b0ec93c1b9dd41c2db831 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Fri, 7 Jun 2024 17:10:55 +0100
Subject: [PATCH] Update config to full scabbers Mailman config.

---
 states/mailman/etc/mailman-hyperkitty.cfg | 22 ++++++++++++++++++++++
 states/mailman/etc/mailman-web.py         |  4 ++--
 states/mailman/init.sls                   |  5 +++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 states/mailman/etc/mailman-hyperkitty.cfg

diff --git a/states/mailman/etc/mailman-hyperkitty.cfg b/states/mailman/etc/mailman-hyperkitty.cfg
new file mode 100644
index 0000000..85eebde
--- /dev/null
+++ b/states/mailman/etc/mailman-hyperkitty.cfg
@@ -0,0 +1,22 @@
+# This is the mailman extension configuration file to enable HyperKitty as an
+# archiver. Remember to add the following lines in the mailman.cfg file:
+#
+# [archiver.hyperkitty]
+# class: mailman_hyperkitty.Archiver
+# enable: yes
+# configuration: /etc/mailman3/mailman-hyperkitty.cfg
+#
+
+[general]
+
+# This is your HyperKitty installation, preferably on the localhost. This
+# address will be used by Mailman to forward incoming emails to HyperKitty
+# for archiving. It does not need to be publicly available, in fact it's
+# better if it is not.
+# However, if your Mailman installation is accessed via HTTPS, the URL needs
+# to match your SSL certificate (e.g. https://lists.example.com/hyperkitty).
+base_url: http://lists.cryhavoc.org.uk/mailman3/hyperkitty/
+
+# The shared api_key, must be identical except for quoting to the value of
+# MAILMAN_ARCHIVER_KEY in HyperKitty's settings.
+api_key: '{{ pillar['mailman']['archiver_key'] }}'
diff --git a/states/mailman/etc/mailman-web.py b/states/mailman/etc/mailman-web.py
index b639c1a..c91e3bb 100644
--- a/states/mailman/etc/mailman-web.py
+++ b/states/mailman/etc/mailman-web.py
@@ -129,7 +129,7 @@ USE_TZ = True
 
 
 # Set default domain for email addresses.
-EMAILNAME = 'localhost.local'
+EMAILNAME = 'lunch.org.uk'
 
 # If you enable internal authentication, this is the address that the emails
 # will appear to be coming from. Make sure you set a valid domain name,
@@ -187,7 +187,7 @@ SOCIALACCOUNT_PROVIDERS = {
 # http://django-compressor.readthedocs.io/en/latest/usage/#offline-compression
 COMPRESS_OFFLINE = True
 
-POSTORIUS_TEMPLATE_BASE_URL = 'http://localhost/mailman3/'
+POSTORIUS_TEMPLATE_BASE_URL = 'https://lists.cryhavoc.org.uk/mailman3/'
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 Q_CLUSTER = {
diff --git a/states/mailman/init.sls b/states/mailman/init.sls
index c7e728c..c2903ea 100644
--- a/states/mailman/init.sls
+++ b/states/mailman/init.sls
@@ -12,6 +12,11 @@ mailman3_conf:
         - group: list
         - mode: 0640
         - template: jinja
+      - /etc/mailman3/mailman-hyperkitty.cfg:
+        - source: salt://mailman/etc/mailman-hyperkitty.cfg
+        - group: list
+        - mode: 0640
+        - template: jinja
       - /etc/mailman3/mailman-web.py:
         - source: salt://mailman/etc/mailman-web.py
         - group: www-data