From 34fb59bf87f73d178bc05e3c81ab7af6eca4f1cd Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Sep 02 2020 22:11:54 +0000
Subject: Merge branch 'hellcp/mailman3' into 'production'


Fix the cronjobs and add a cronjob for generating postfix aliases

See merge request infra/salt!442
---

diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls
index a453663..81b0180 100644
--- a/salt/profile/mailman3/mailman.sls
+++ b/salt/profile/mailman3/mailman.sls
@@ -38,22 +38,28 @@ mailman_notify:
     - minute: 0
     - hour: 8
 
+mailman_aliases:
+  cron.present:
+    - name: /usr/bin/mailman aliases
+    - user: mailman
+    - minute: 0
+
 mailman_hourly:
   cron.present:
-    - name: django-admin runjobs hourly --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs hourly --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
     - minute: 0
 
 mailman_daily:
   cron.present:
-    - name: django-admin runjobs daily --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs daily --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
     - minute: 0
     - hour: 0
 
 mailman_weekly:
   cron.present:
-    - name: django-admin runjobs weekly --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs weekly --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
     - minute: 0
     - hour: 0
@@ -61,7 +67,7 @@ mailman_weekly:
 
 mailman_monthly:
   cron.present:
-    - name: django-admin runjobs monthly --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs monthly --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
     - minute: 0
     - hour: 0
@@ -69,7 +75,7 @@ mailman_monthly:
 
 mailman_yearly:
   cron.present:
-    - name: django-admin runjobs yearly --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs yearly --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
     - minute: 0
     - hour: 0
@@ -78,11 +84,11 @@ mailman_yearly:
 
 mailman_minutely:
   cron.present:
-    - name: django-admin runjobs minutely --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs minutely --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
 
 mailman_quarter_hourly:
   cron.present:
-    - name: django-admin runjobs quarter_hourly --pythonpath /var/lib/mailman --settings settings
+    - name: django-admin runjobs quarter_hourly --pythonpath /var/lib/mailman_webui --settings settings
     - user: mailman
     - minute: '0,15,30,45'